undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

longest_ancestor_length(): use string_list_split()

Browse Source 
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
Michael Haggerty 2012-10-28 17:16:23 +01:00 committed by Jeff King
parent e3e46cdbd4
commit a5ccdbe416
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
path.c
View File

@ -12,6 +12,7 @@
*/ */
#include "cache.h" #include "cache.h"
#include "strbuf.h" #include "strbuf.h"
#include "string-list.h"
static char bad_path[] = "/bad-path/"; static char bad_path[] = "/bad-path/";
@ -582,20 +583,22 @@ int normalize_path_copy(char *dst, const char *src)
*/ */
int longest_ancestor_length(const char *path, const char *prefix_list) int longest_ancestor_length(const char *path, const char *prefix_list)
{ {
struct string_list prefixes = STRING_LIST_INIT_DUP;
char buf[PATH_MAX+1]; char buf[PATH_MAX+1];
const char *ceil, *colon; int i, max_len = -1;
int len, max_len = -1;
if (prefix_list == NULL || !strcmp(path, "/")) if (prefix_list == NULL || !strcmp(path, "/"))
return -1; return -1;
for (colon = ceil = prefix_list; *colon; ceil = colon+1) { string_list_split(&prefixes, prefix_list, PATH_SEP, -1);
for (colon = ceil; *colon && *colon != PATH_SEP; colon++);
len = colon - ceil; for (i = 0; i < prefixes.nr; i++) {
const char *ceil = prefixes.items[i].string;
int len = strlen(ceil);
if (len == 0 || len > PATH_MAX || !is_absolute_path(ceil)) if (len == 0 || len > PATH_MAX || !is_absolute_path(ceil))
continue; continue;
strlcpy(buf, ceil, len+1); if (normalize_path_copy(buf, ceil) < 0)
if (normalize_path_copy(buf, buf) < 0)
continue; continue;
len = strlen(buf); len = strlen(buf);
if (len > 0 && buf[len-1] == '/') if (len > 0 && buf[len-1] == '/')
@ -608,6 +611,7 @@ int longest_ancestor_length(const char *path, const char *prefix_list)
} }
} }
string_list_clear(&prefixes, 0);
return max_len; return max_len;
} }