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 --- setup.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) (limited to 'setup.c') diff --git a/setup.c b/setup.c index f767d8adb1..70b887fe68 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 v1.2.3