do a single open(2) call in get_file_status()
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
diff --git a/lib/worktree.c b/lib/worktree.c
index 08d2a40..bd32578 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -1041,6 +1041,7 @@ 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;
@@ -1048,7 +1049,8 @@ get_file_status(unsigned char *status, struct stat *sb,
*status = GOT_STATUS_NO_CHANGE;
- if (lstat(abspath, sb) == -1) {
+ fd = open(abspath, O_RDONLY | O_NOFOLLOW);
+ if (fd == -1) {
if (errno == ENOENT) {
if (ie) {
if (got_fileindex_entry_has_file_on_disk(ie))
@@ -1062,38 +1064,44 @@ get_file_status(unsigned char *status, struct stat *sb,
sb->st_mode = GOT_DEFAULT_FILE_MODE;
return NULL;
}
- return got_error_from_errno2("lstat", abspath);
+ return got_error_from_errno2("fopen", abspath);
+ }
+
+ if (fstat(fd, sb) == -1) {
+ err = got_error_from_errno2("fstat", abspath);
+ goto done;
}
if (!S_ISREG(sb->st_mode)) {
*status = GOT_STATUS_OBSTRUCTED;
- return NULL;
+ goto done;
}
if (ie == NULL)
- return NULL;
+ goto done;
if (!got_fileindex_entry_has_file_on_disk(ie)) {
*status = GOT_STATUS_DELETE;
- return NULL;
+ goto done;
} else if (!got_fileindex_entry_has_blob(ie)) {
*status = GOT_STATUS_ADD;
- return NULL;
+ goto done;
}
if (!stat_info_differs(ie, sb))
- return NULL;
+ goto done;
memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf));
if (err)
- return err;
+ goto done;
- f = fopen(abspath, "r");
+ f = fdopen(fd, "r");
if (f == NULL) {
- err = got_error_from_errno2("fopen", abspath);
+ err = got_error_from_errno2("fdopen", abspath);
goto done;
}
+ fd = -1;
hdrlen = got_object_blob_get_hdrlen(blob);
for (;;) {
const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
@@ -1134,6 +1142,8 @@ 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;