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

Teach prepare_attr_stack() to figure out dirlen itself

Browse Source 
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2011-08-04 06:36:19 +02:00 committed by Junio C Hamano
parent 66a1fb3033
commit a872701755
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
attr.c
View File

@ -535,11 +535,18 @@ static void bootstrap_attr_stack(void)
} }
} }
static void prepare_attr_stack(const char *path, int dirlen) static void prepare_attr_stack(const char *path)
{ {
struct attr_stack *elem, *info; struct attr_stack *elem, *info;
int len; int dirlen, len;
struct strbuf pathbuf; struct strbuf pathbuf;
const char *cp;
cp = strrchr(path, '/');
if (!cp)
dirlen = 0;
else
dirlen = cp - path;
strbuf_init(&pathbuf, dirlen+2+strlen(GITATTRIBUTES_FILE)); strbuf_init(&pathbuf, dirlen+2+strlen(GITATTRIBUTES_FILE));
@ -709,20 +716,14 @@ static int macroexpand_one(int attr_nr, int rem)
int git_checkattr(const char *path, int num, struct git_attr_check *check) int git_checkattr(const char *path, int num, struct git_attr_check *check)
{ {
struct attr_stack *stk; struct attr_stack *stk;
const char *cp; int pathlen, i, rem;
int dirlen, pathlen, i, rem;
bootstrap_attr_stack(); bootstrap_attr_stack();
for (i = 0; i < attr_nr; i++) for (i = 0; i < attr_nr; i++)
check_all_attr[i].value = ATTR__UNKNOWN; check_all_attr[i].value = ATTR__UNKNOWN;
pathlen = strlen(path); pathlen = strlen(path);
cp = strrchr(path, '/'); prepare_attr_stack(path);
if (!cp)
dirlen = 0;
else
dirlen = cp - path;
prepare_attr_stack(path, dirlen);
rem = attr_nr; rem = attr_nr;
for (stk = attr_stack; 0 < rem && stk; stk = stk->prev) for (stk = attr_stack; 0 < rem && stk; stk = stk->prev)
rem = fill(path, pathlen, stk, rem); rem = fill(path, pathlen, stk, rem);