From 5879f5684cfe8a38326b4ffd078f96e35c68e640 Mon Sep 17 00:00:00 2001 From: Clemens Buchacher Date: Sun, 4 Sep 2011 12:41:59 +0200 Subject: remove prefix argument from pathspec_prefix Passing a prefix to a function that is supposed to find the prefix is strange. And it's really only used if the pathspec is NULL. Make the callers handle this case instead. As we are always returning a fresh copy of a string (or NULL), change the type of the returned value to non-const "char *". Signed-off-by: Clemens Buchacher Signed-off-by: Junio C Hamano diff --git a/builtin/commit.c b/builtin/commit.c index cb73857..50bacd6 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -257,8 +257,9 @@ static int list_paths(struct string_list *list, const char *with_tree, m = xcalloc(1, i); if (with_tree) { - const char *max_prefix = pathspec_prefix(prefix, pattern); - overlay_tree_on_cache(with_tree, max_prefix); + char *max_prefix = pathspec_prefix(pattern); + overlay_tree_on_cache(with_tree, max_prefix ? max_prefix : prefix); + free(max_prefix); } for (i = 0; i < active_nr; i++) { diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 0e98bff..19e53cc 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -541,7 +541,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) strip_trailing_slash_from_submodules(); /* Find common prefix for all pathspec's */ - max_prefix = pathspec_prefix(prefix, pathspec); + max_prefix = pathspec_prefix(pathspec); max_prefix_len = max_prefix ? strlen(max_prefix) : 0; /* Treat unmatching pathspec elements as errors */ diff --git a/cache.h b/cache.h index 553a6eb..a3462ba 100644 --- a/cache.h +++ b/cache.h @@ -426,7 +426,7 @@ extern void set_git_work_tree(const char *tree); #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES" extern const char **get_pathspec(const char *prefix, const char **pathspec); -extern const char *pathspec_prefix(const char *prefix, const char **pathspec); +extern char *pathspec_prefix(const char **pathspec); extern void setup_work_tree(void); extern const char *setup_git_directory_gently(int *); extern const char *setup_git_directory(void); diff --git a/setup.c b/setup.c index 699fcf0..f767d8a 100644 --- a/setup.c +++ b/setup.c @@ -264,13 +264,13 @@ const char **get_pathspec(const char *prefix, const char **pathspec) return pathspec; } -const char *pathspec_prefix(const char *prefix, const char **pathspec) +char *pathspec_prefix(const char **pathspec) { const char **p, *n, *prev; unsigned long max; if (!pathspec) - return prefix ? xmemdupz(prefix, strlen(prefix)) : NULL; + return NULL; prev = NULL; max = PATH_MAX; -- cgit v0.10.2-6-g49f6 From 4a085b16f430bcfe1b6e2e84e7a569f4e191e906 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 6 Sep 2011 12:32:30 -0700 Subject: consolidate pathspec_prefix and common_prefix The implementation from pathspec_prefix (slightly modified) replaces the current common_prefix, because it also respects glob characters. Based on a patch by Clemens Buchacher. Signed-off-by: Junio C Hamano diff --git a/dir.c b/dir.c index 08281d2..7bc75c9 100644 --- a/dir.c +++ b/dir.c @@ -34,49 +34,43 @@ int fnmatch_icase(const char *pattern, const char *string, int flags) return fnmatch(pattern, string, flags | (ignore_case ? FNM_CASEFOLD : 0)); } -static int common_prefix(const char **pathspec) +size_t common_prefix_len(const char **pathspec) { - const char *path, *slash, *next; - int prefix; + const char *n, *first; + size_t max = 0; if (!pathspec) - return 0; - - path = *pathspec; - slash = strrchr(path, '/'); - if (!slash) - return 0; - - /* - * The first 'prefix' characters of 'path' are common leading - * path components among the pathspecs we have seen so far, - * including the trailing slash. - */ - prefix = slash - path + 1; - while ((next = *++pathspec) != NULL) { - int len, last_matching_slash = -1; - for (len = 0; len < prefix && next[len] == path[len]; len++) - if (next[len] == '/') - last_matching_slash = len; - if (len == prefix) - continue; - if (last_matching_slash < 0) - return 0; - prefix = last_matching_slash + 1; + return max; + + first = *pathspec; + while ((n = *pathspec++)) { + size_t i, len = 0; + for (i = 0; first == n || i < max; i++) { + char c = n[i]; + if (!c || c != first[i] || is_glob_special(c)) + break; + if (c == '/') + len = i + 1; + } + if (first == n || len < max) { + max = len; + if (!max) + break; + } } - return prefix; + return max; } int fill_directory(struct dir_struct *dir, const char **pathspec) { const char *path; - int len; + size_t len; /* * Calculate common prefix for the pathspec, and * use that to optimize the directory walk */ - len = common_prefix(pathspec); + len = common_prefix_len(pathspec); path = ""; if (len) @@ -84,6 +78,8 @@ int fill_directory(struct dir_struct *dir, const char **pathspec) /* Read the directory and prune it */ read_directory(dir, path, len, pathspec); + if (*path) + free((char *)path); return len; } diff --git a/dir.h b/dir.h index 433b5b4..467d197 100644 --- a/dir.h +++ b/dir.h @@ -64,6 +64,7 @@ struct dir_struct { #define MATCHED_RECURSIVELY 1 #define MATCHED_FNMATCH 2 #define MATCHED_EXACTLY 3 +extern size_t common_prefix_len(const char **pathspec); extern int match_pathspec(const char **pathspec, const char *name, int namelen, int prefix, char *seen); extern int match_pathspec_depth(const struct pathspec *pathspec, const char *name, int namelen, diff --git a/setup.c b/setup.c index f767d8a..70b887f 100644 --- a/setup.c +++ b/setup.c @@ -266,34 +266,9 @@ const char **get_pathspec(const char *prefix, const char **pathspec) char *pathspec_prefix(const char **pathspec) { - const char **p, *n, *prev; - unsigned long max; + size_t len = common_prefix_len(pathspec); - if (!pathspec) - return NULL; - - prev = NULL; - max = PATH_MAX; - for (p = pathspec; (n = *p) != NULL; p++) { - int i, len = 0; - for (i = 0; i < max; i++) { - char c = n[i]; - if (prev && prev[i] != c) - break; - if (!c || c == '*' || c == '?') - break; - if (c == '/') - len = i+1; - } - prev = n; - if (len < max) { - max = len; - if (!max) - break; - } - } - - return max ? xmemdupz(prev, max) : NULL; + return len ? xmemdupz(*pathspec, len) : NULL; } /* -- cgit v0.10.2-6-g49f6 From f950eb956092831730182daa7160eaa352277fa9 Mon Sep 17 00:00:00 2001 From: Clemens Buchacher Date: Sun, 4 Sep 2011 12:42:01 +0200 Subject: rename pathspec_prefix() to common_prefix() and move to dir.[ch] Also make common_prefix_len() static as this refactoring makes dir.c itself the only caller of this helper function. Signed-off-by: Clemens Buchacher Signed-off-by: Junio C Hamano diff --git a/builtin/commit.c b/builtin/commit.c index 50bacd6..1e8e0ac 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -257,7 +257,7 @@ static int list_paths(struct string_list *list, const char *with_tree, m = xcalloc(1, i); if (with_tree) { - char *max_prefix = pathspec_prefix(pattern); + char *max_prefix = common_prefix(pattern); overlay_tree_on_cache(with_tree, max_prefix ? max_prefix : prefix); free(max_prefix); } diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 19e53cc..0956bb5 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -541,7 +541,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) strip_trailing_slash_from_submodules(); /* Find common prefix for all pathspec's */ - max_prefix = pathspec_prefix(pathspec); + max_prefix = common_prefix(pathspec); max_prefix_len = max_prefix ? strlen(max_prefix) : 0; /* Treat unmatching pathspec elements as errors */ diff --git a/cache.h b/cache.h index a3462ba..e11cf6a 100644 --- a/cache.h +++ b/cache.h @@ -426,7 +426,6 @@ extern void set_git_work_tree(const char *tree); #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES" extern const char **get_pathspec(const char *prefix, const char **pathspec); -extern char *pathspec_prefix(const char **pathspec); extern void setup_work_tree(void); extern const char *setup_git_directory_gently(int *); extern const char *setup_git_directory(void); diff --git a/dir.c b/dir.c index 7bc75c9..6c0d782 100644 --- a/dir.c +++ b/dir.c @@ -34,7 +34,7 @@ int fnmatch_icase(const char *pattern, const char *string, int flags) return fnmatch(pattern, string, flags | (ignore_case ? FNM_CASEFOLD : 0)); } -size_t common_prefix_len(const char **pathspec) +static size_t common_prefix_len(const char **pathspec) { const char *n, *first; size_t max = 0; @@ -61,6 +61,17 @@ size_t common_prefix_len(const char **pathspec) return max; } +/* + * Returns a copy of the longest leading path common among all + * pathspecs. + */ +char *common_prefix(const char **pathspec) +{ + unsigned long len = common_prefix_len(pathspec); + + return len ? xmemdupz(*pathspec, len) : NULL; +} + int fill_directory(struct dir_struct *dir, const char **pathspec) { const char *path; diff --git a/dir.h b/dir.h index 467d197..dd6947e 100644 --- a/dir.h +++ b/dir.h @@ -64,7 +64,7 @@ struct dir_struct { #define MATCHED_RECURSIVELY 1 #define MATCHED_FNMATCH 2 #define MATCHED_EXACTLY 3 -extern size_t common_prefix_len(const char **pathspec); +extern char *common_prefix(const char **pathspec); extern int match_pathspec(const char **pathspec, const char *name, int namelen, int prefix, char *seen); extern int match_pathspec_depth(const struct pathspec *pathspec, const char *name, int namelen, diff --git a/setup.c b/setup.c index 70b887f..ce87900 100644 --- a/setup.c +++ b/setup.c @@ -264,13 +264,6 @@ const char **get_pathspec(const char *prefix, const char **pathspec) return pathspec; } -char *pathspec_prefix(const char **pathspec) -{ - size_t len = common_prefix_len(pathspec); - - return len ? xmemdupz(*pathspec, len) : NULL; -} - /* * Test if it looks like we're at a git directory. * We want to see: -- cgit v0.10.2-6-g49f6