path: root/dir.c
diff options
authorLinus Torvalds <>2009-05-14 20:22:36 (GMT)
committerJunio C Hamano <>2009-07-09 08:11:26 (GMT)
commit1d8842d921cc2695f155f4a10904eeffad085c77 (patch)
tree87186d8b5c8116ec5b442c6f401c2c3a6729de53 /dir.c
parentf581de1b7b9d17c83b188bf8ffe536fb8a9dd2a4 (diff)
Add 'fill_directory()' helper function for directory traversal
Most of the users of "read_directory()" actually want a much simpler interface than the whole complex (but rather powerful) one. In fact 'git add' had already largely abstracted out the core interface issues into a private "fill_directory()" function that was largely applicable almost as-is to a number of callers. Yes, 'git add' wants to do some extra work of its own, specific to the add semantics, but we can easily split that out, and use the core as a generic function. This function does exactly that, and now that much simplified 'fill_directory()' function can be shared with a number of callers, while also ensuring that the rather more complex calling conventions of read_directory() are used by fewer call-sites. This also makes the 'common_prefix()' helper function private to dir.c, since all callers are now in that file. Signed-off-by: Linus Torvalds <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'dir.c')
1 files changed, 22 insertions, 1 deletions
diff --git a/dir.c b/dir.c
index 74b3bbf..0c8553b 100644
--- a/dir.c
+++ b/dir.c
@@ -19,7 +19,7 @@ static int read_directory_recursive(struct dir_struct *dir,
int check_only, const struct path_simplify *simplify);
static int get_dtype(struct dirent *de, const char *path);
-int common_prefix(const char **pathspec)
+static int common_prefix(const char **pathspec)
const char *path, *slash, *next;
int prefix;
@@ -52,6 +52,27 @@ int common_prefix(const char **pathspec)
return prefix;
+int fill_directory(struct dir_struct *dir, const char **pathspec)
+ const char *path, *base;
+ int baselen;
+ /*
+ * Calculate common prefix for the pathspec, and
+ * use that to optimize the directory walk
+ */
+ baselen = common_prefix(pathspec);
+ path = "";
+ base = "";
+ if (baselen)
+ path = base = xmemdupz(*pathspec, baselen);
+ /* Read the directory and prune it */
+ read_directory(dir, path, base, baselen, pathspec);
+ return baselen;
* Does 'match' match the given name?
* A match is found if