commit - f4d199c99e2463414ab27d393fa98378de352bad
commit + 6fc93f379e4f736797334532691d298244b2b014
blob - a41a89c62ebf12fa26c7ef903d7d2fbd4f491499
blob + fb6e5d9eb31559927f1b54206fa50f15527f880b
--- lib/fileindex.c
+++ lib/fileindex.c
#include <errno.h>
#include <dirent.h>
+#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sha1.h>
#include <endian.h>
#include <limits.h>
+#include <unistd.h>
#include <uuid.h>
#include "got_error.h"
static const struct got_error *
diff_fileindex_dir(struct got_fileindex *, struct got_fileindex_entry **,
- struct got_pathlist_head *, const char *, const char *,
+ struct got_pathlist_head *, int, const char *, const char *,
struct got_repository *, struct got_fileindex_diff_dir_cb *, void *);
static const struct got_error *
-read_dirlist(struct got_pathlist_head *dirlist, DIR *dir, const char *path)
+read_dirlist(struct got_pathlist_head *dirlist, int dirfd, const char *path)
{
const struct got_error *err = NULL;
struct got_pathlist_entry *new = NULL;
+ DIR *dir = NULL;
struct dirent *dep = NULL;
struct dirent *de = NULL;
+ if (lseek(dirfd, SEEK_SET, 0) == -1)
+ return got_error_from_errno("lseek");
+
+ dir = fdopendir(dirfd);
for (;;) {
de = malloc(sizeof(struct dirent) + NAME_MAX + 1);
if (de == NULL) {
static const struct got_error *
walk_dir(struct got_pathlist_entry **next, struct got_fileindex *fileindex,
- struct got_fileindex_entry **ie, struct got_pathlist_entry *dle,
+ struct got_fileindex_entry **ie, struct got_pathlist_entry *dle, int dirfd,
const char *path, const char *rootpath, struct got_repository *repo,
struct got_fileindex_diff_dir_cb *cb, void *cb_arg)
{
const struct got_error *err = NULL;
struct dirent *de = dle->data;
+ int subdirfd = -1;
*next = NULL;
if (de->d_type == DT_DIR) {
char *subpath;
char *subdirpath;
- DIR *subdir;
struct got_pathlist_head subdirlist;
TAILQ_INIT(&subdirlist);
return got_error_from_errno("asprintf");
}
- subdir = opendir(subdirpath);
- if (subdir == NULL) {
+ subdirfd = openat(dirfd, de->d_name,
+ O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
+ if (subdirfd == -1) {
if (errno == EACCES) {
*next = TAILQ_NEXT(dle, entry);
return NULL;
return err;
}
- err = read_dirlist(&subdirlist, subdir, subdirpath);
+ err = read_dirlist(&subdirlist, subdirfd, subdirpath);
if (err) {
free(subpath);
free(subdirpath);
- closedir(subdir);
+ close(subdirfd);
return err;
}
- err = diff_fileindex_dir(fileindex, ie, &subdirlist, rootpath,
- subpath, repo, cb, cb_arg);
+ err = diff_fileindex_dir(fileindex, ie, &subdirlist, subdirfd,
+ rootpath, subpath, repo, cb, cb_arg);
+ if (subdirfd != -1 && close(subdirfd) == -1 && err == NULL)
+ err = got_error_from_errno2("close", subdirpath);
free(subpath);
free(subdirpath);
- closedir(subdir);
free_dirlist(&subdirlist);
if (err)
return err;
static const struct got_error *
diff_fileindex_dir(struct got_fileindex *fileindex,
struct got_fileindex_entry **ie, struct got_pathlist_head *dirlist,
- const char *rootpath, const char *path, struct got_repository *repo,
+ int dirfd, const char *rootpath, const char *path,
+ struct got_repository *repo,
struct got_fileindex_diff_dir_cb *cb, void *cb_arg)
{
const struct got_error *err = NULL;
if (err)
break;
*ie = walk_fileindex(fileindex, *ie);
- err = walk_dir(&dle, fileindex, ie, dle, path,
- rootpath, repo, cb, cb_arg);
+ err = walk_dir(&dle, fileindex, ie, dle, dirfd,
+ path, rootpath, repo, cb, cb_arg);
} else if (cmp < 0 ) {
err = cb->diff_old(cb_arg, *ie, path);
if (err)
err = cb->diff_new(cb_arg, de, path);
if (err)
break;
- err = walk_dir(&dle, fileindex, ie, dle, path,
- rootpath, repo, cb, cb_arg);
+ err = walk_dir(&dle, fileindex, ie, dle, dirfd,
+ path, rootpath, repo, cb, cb_arg);
}
if (err)
break;
err = cb->diff_new(cb_arg, de, path);
if (err)
break;
- err = walk_dir(&dle, fileindex, ie, dle, path,
+ err = walk_dir(&dle, fileindex, ie, dle, dirfd, path,
rootpath, repo, cb, cb_arg);
if (err)
break;
}
const struct got_error *
-got_fileindex_diff_dir(struct got_fileindex *fileindex, DIR *rootdir,
+got_fileindex_diff_dir(struct got_fileindex *fileindex, int dirfd,
const char *rootpath, const char *path, struct got_repository *repo,
struct got_fileindex_diff_dir_cb *cb, void *cb_arg)
{
struct got_pathlist_head dirlist;
TAILQ_INIT(&dirlist);
- err = read_dirlist(&dirlist, rootdir, path);
+ err = read_dirlist(&dirlist, dirfd, path);
if (err)
return err;
ie = RB_MIN(got_fileindex_tree, &fileindex->entries);
while (ie && !got_path_is_child(ie->path, path, strlen(path)))
ie = walk_fileindex(fileindex, ie);
- err = diff_fileindex_dir(fileindex, &ie, &dirlist, rootpath, path,
- repo, cb, cb_arg);
+ err = diff_fileindex_dir(fileindex, &ie, &dirlist, dirfd, rootpath,
+ path, repo, cb, cb_arg);
free_dirlist(&dirlist);
return err;
}
blob - 83e6be7d83308583c41892a51e5aa6a7f5bac56c
blob + a0d9a4a7a1b6db01b131c605ab1e4224937d5d8f
--- lib/got_lib_fileindex.h
+++ lib/got_lib_fileindex.h
got_fileindex_diff_dir_old_cb diff_old;
got_fileindex_diff_dir_new_cb diff_new;
};
-const struct got_error *got_fileindex_diff_dir(struct got_fileindex *, DIR *,
+const struct got_error *got_fileindex_diff_dir(struct got_fileindex *, int,
const char *, const char *, struct got_repository *,
struct got_fileindex_diff_dir_cb *, void *);
blob - 97439bcdb73352802a76bf9d776689b42f8aa53b
blob + 7521cbbef153cce72990ef48d89b7d54d0608873
--- lib/worktree.c
+++ lib/worktree.c
int report_unchanged)
{
const struct got_error *err = NULL;
- DIR *workdir = NULL;
+ int fd = -1;
struct got_fileindex_diff_dir_cb fdiff_cb;
struct diff_dir_cb_arg arg;
char *ondisk_path = NULL;
worktree->root_path, path[0] ? "/" : "", path) == -1)
return got_error_from_errno("asprintf");
- workdir = opendir(ondisk_path);
- if (workdir == NULL) {
+ fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
+ if (fd == -1) {
if (errno != ENOTDIR && errno != ENOENT && errno != EACCES)
- err = got_error_from_errno2("opendir", ondisk_path);
+ err = got_error_from_errno2("open", ondisk_path);
else
err = report_single_file_status(path, ondisk_path,
fileindex, status_cb, status_arg, repo,
worktree->root_path, path, ".gitignore");
}
if (err == NULL)
- err = got_fileindex_diff_dir(fileindex, workdir,
+ err = got_fileindex_diff_dir(fileindex, fd,
worktree->root_path, path, repo, &fdiff_cb, &arg);
free_ignores(&arg.ignores);
}
- if (workdir)
- closedir(workdir);
+ if (fd != -1 && close(fd) != 0 && err == NULL)
+ err = got_error_from_errno("close");
free(ondisk_path);
return err;
}