mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/dir-strbuf-read-recursive-fix'

Browse Source 
Simplification for the codepath to read directories recursively.

By René Scharfe
* rs/dir-strbuf-read-recursive-fix:
  dir: simplify fill_directory()
  dir: respect string length argument of read_directory_recursive()
This commit is contained in:
Junio C Hamano
2012-05-25 12:07:52 -07:00
parent b19ea23473 2b189435f3
commit 3501b89fb5
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dir.c
View File

@ -74,7 +74,6 @@ char *common_prefix(const char **pathspec)
int fill_directory(struct dir_struct *dir, const char **pathspec) int fill_directory(struct dir_struct *dir, const char **pathspec)
{ {
const char *path;
size_t len; size_t len;
/* /*
@ -82,15 +81,9 @@ int fill_directory(struct dir_struct *dir, const char **pathspec)
* use that to optimize the directory walk * use that to optimize the directory walk
*/ */
len = common_prefix_len(pathspec); len = common_prefix_len(pathspec);
path = "";
if (len)
path = xmemdupz(*pathspec, len);
/* Read the directory and prune it */ /* Read the directory and prune it */
read_directory(dir, path, len, pathspec); read_directory(dir, pathspec ? *pathspec : "", len, pathspec);
if (*path)
free((char *)path);
return len; return len;
} }
@ -960,16 +953,17 @@ static int read_directory_recursive(struct dir_struct *dir,
int check_only, int check_only,
const struct path_simplify *simplify) const struct path_simplify *simplify)
{ {
DIR *fdir = opendir(*base ? base : "."); DIR *fdir;
int contents = 0; int contents = 0;
struct dirent *de; struct dirent *de;
struct strbuf path = STRBUF_INIT; struct strbuf path = STRBUF_INIT;
if (!fdir)
return 0;
strbuf_add(&path, base, baselen); strbuf_add(&path, base, baselen);
fdir = opendir(path.len ? path.buf : ".");
if (!fdir)
goto out;
while ((de = readdir(fdir)) != NULL) { while ((de = readdir(fdir)) != NULL) {
switch (treat_path(dir, de, &path, baselen, simplify)) { switch (treat_path(dir, de, &path, baselen, simplify)) {
case path_recurse: case path_recurse:
@ -984,12 +978,11 @@ static int read_directory_recursive(struct dir_struct *dir,
} }
contents++; contents++;
if (check_only) if (check_only)
goto exit_early; break;
else dir_add_name(dir, path.buf, path.len);
dir_add_name(dir, path.buf, path.len);
} }
exit_early:
closedir(fdir); closedir(fdir);
out:
strbuf_release(&path); strbuf_release(&path);
return contents; return contents;