Commit 339c298e66d94d2a92f3b1af99c60e0e4172b1e7
2019-07-27T16:25:48
undo previous 3 commits; stat is faster than open
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104
diff --git a/lib/worktree.c b/lib/worktree.c
index fd98027..08d2a40 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -1033,7 +1033,6 @@ stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
ie->size == (sb->st_size & 0xffffffff));
}
-/* Report file status and initialize sb->st_mode. */
static const struct got_error *
get_file_status(unsigned char *status, struct stat *sb,
struct got_fileindex_entry *ie, const char *abspath,
@@ -1042,7 +1041,6 @@ get_file_status(unsigned char *status, struct stat *sb,
const struct got_error *err = NULL;
struct got_object_id id;
size_t hdrlen;
- int fd;
FILE *f = NULL;
uint8_t fbuf[8192];
struct got_blob_object *blob = NULL;
@@ -1050,8 +1048,7 @@ get_file_status(unsigned char *status, struct stat *sb,
*status = GOT_STATUS_NO_CHANGE;
- fd = open(abspath, O_RDONLY | O_NOFOLLOW);
- if (fd == -1) {
+ if (lstat(abspath, sb) == -1) {
if (errno == ENOENT) {
if (ie) {
if (got_fileindex_entry_has_file_on_disk(ie))
@@ -1065,50 +1062,38 @@ get_file_status(unsigned char *status, struct stat *sb,
sb->st_mode = GOT_DEFAULT_FILE_MODE;
return NULL;
}
- return got_error_from_errno2("open", abspath);
+ return got_error_from_errno2("lstat", abspath);
}
- if (ie == NULL) {
- sb->st_mode = GOT_DEFAULT_FILE_MODE;
- goto done;
+ if (!S_ISREG(sb->st_mode)) {
+ *status = GOT_STATUS_OBSTRUCTED;
+ return NULL;
}
- if (fstat(fd, sb) == -1) {
- err = got_error_from_errno2("fstat", abspath);
- goto done;
- }
+ if (ie == NULL)
+ return NULL;
if (!got_fileindex_entry_has_file_on_disk(ie)) {
- if (S_ISREG(sb->st_mode))
- *status = GOT_STATUS_DELETE;
- else
- *status = GOT_STATUS_OBSTRUCTED;
- goto done;
+ *status = GOT_STATUS_DELETE;
+ return NULL;
} else if (!got_fileindex_entry_has_blob(ie)) {
- if (S_ISREG(sb->st_mode))
- *status = GOT_STATUS_ADD;
- else
- *status = GOT_STATUS_OBSTRUCTED;
- goto done;
- } else if (!S_ISREG(sb->st_mode)) {
- *status = GOT_STATUS_OBSTRUCTED;
- goto done;
+ *status = GOT_STATUS_ADD;
+ return NULL;
}
if (!stat_info_differs(ie, sb))
- goto done;
+ return NULL;
memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
if (err)
- goto done;
+ return err;
- f = fdopen(fd, "r");
+ f = fopen(abspath, "r");
if (f == NULL) {
- err = got_error_from_errno2("fdopen", abspath);
+ err = got_error_from_errno2("fopen", abspath);
goto done;
}
- fd = -1;
hdrlen = got_object_blob_get_hdrlen(blob);
for (;;) {
const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
@@ -1149,8 +1134,6 @@ get_file_status(unsigned char *status, struct stat *sb,
done:
if (blob)
got_object_blob_close(blob);
- if (fd != -1 && close(fd) == -1 && err == NULL)
- err = got_error_from_errno2("close", abspath);
if (f)
fclose(f);
return err;