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

consolidate pathspec_prefix and common_prefix

Browse Source 
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 <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2011-09-06 12:32:30 -07:00
parent 5879f5684c
commit 4a085b16f4
3 changed files with 27 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
dir.c
View File

@ -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;
return max;
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;
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;
}