mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-19 06:39:18 +02:00
Code

Merge branch 'jc/maint-simpler-common-prefix' 

* jc/maint-simpler-common-prefix:
  common_prefix: simplify and fix scanning for prefixes
This commit is contained in:
Junio C Hamano 2010-06-22 09:45:23 -07:00
parent 6bead0c320 42f9852f3c
commit 2c177a1ca1
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dir.c
View File

@ -31,22 +31,22 @@ static int common_prefix(const char **pathspec)
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 = strlen(next);
if (len >= prefix && !memcmp(path, next, prefix))
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;
len = prefix - 1;
for (;;) {
if (!len)
return 0;
if (next[--len] != '/')
continue;
if (memcmp(path, next, len+1))
continue;
prefix = len + 1;
break;
}
if (last_matching_slash < 0)
return 0;
prefix = last_matching_slash + 1;
}
return prefix;
}