Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
attr.c::path_matches(): the basename is part of the pathname
author
Junio C Hamano
<gitster@pobox.com>
Tue, 26 Mar 2013 17:28:07 +0000
(10:28 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 26 Mar 2013 18:09:01 +0000
(11:09 -0700)
The function takes two strings (pathname and basename) as if they
are independent strings, but in reality, the latter is always
pointing into a substring in the former.
Clarify this relationship by expressing the latter as an offset into
the former.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
attr.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
9db9eec
)
diff --git
a/attr.c
b/attr.c
index ab2aab28de88e9850d3c51163a8360191ee2e340..4cfe0ee0fca6b3077b742d7879eaefef82045eaa 100644
(file)
--- a/
attr.c
+++ b/
attr.c
@@
-655,7
+655,7
@@
static void prepare_attr_stack(const char *path, int dirlen)
}
static int path_matches(const char *pathname, int pathlen,
}
static int path_matches(const char *pathname, int pathlen,
-
const char *basename
,
+
int basename_offset
,
const struct pattern *pat,
const char *base, int baselen)
{
const struct pattern *pat,
const char *base, int baselen)
{
@@
-667,8
+667,8
@@
static int path_matches(const char *pathname, int pathlen,
return 0;
if (pat->flags & EXC_FLAG_NODIR) {
return 0;
if (pat->flags & EXC_FLAG_NODIR) {
- return match_basename(
basename
,
- pathlen -
(basename - pathname)
,
+ return match_basename(
pathname + basename_offset
,
+ pathlen -
basename_offset
,
pattern, prefix,
pat->patternlen, pat->flags);
}
pattern, prefix,
pat->patternlen, pat->flags);
}
@@
-701,7
+701,7
@@
static int fill_one(const char *what, struct match_attr *a, int rem)
return rem;
}
return rem;
}
-static int fill(const char *path, int pathlen,
const char *basename
,
+static int fill(const char *path, int pathlen,
int basename_offset
,
struct attr_stack *stk, int rem)
{
int i;
struct attr_stack *stk, int rem)
{
int i;
@@
-711,7
+711,7
@@
static int fill(const char *path, int pathlen, const char *basename,
struct match_attr *a = stk->attrs[i];
if (a->is_macro)
continue;
struct match_attr *a = stk->attrs[i];
if (a->is_macro)
continue;
- if (path_matches(path, pathlen, basename,
+ if (path_matches(path, pathlen, basename
_offset
,
&a->u.pat, base, stk->originlen))
rem = fill_one("fill", a, rem);
}
&a->u.pat, base, stk->originlen))
rem = fill_one("fill", a, rem);
}
@@
-750,7
+750,8
@@
static void collect_all_attrs(const char *path)
{
struct attr_stack *stk;
int i, pathlen, rem, dirlen;
{
struct attr_stack *stk;
int i, pathlen, rem, dirlen;
- const char *basename, *cp, *last_slash = NULL;
+ const char *cp, *last_slash = NULL;
+ int basename_offset;
for (cp = path; *cp; cp++) {
if (*cp == '/' && cp[1])
for (cp = path; *cp; cp++) {
if (*cp == '/' && cp[1])
@@
-758,10
+759,10
@@
static void collect_all_attrs(const char *path)
}
pathlen = cp - path;
if (last_slash) {
}
pathlen = cp - path;
if (last_slash) {
- basename
= last_slash + 1
;
+ basename
_offset = last_slash + 1 - path
;
dirlen = last_slash - path;
} else {
dirlen = last_slash - path;
} else {
- basename
= path
;
+ basename
_offset = 0
;
dirlen = 0;
}
dirlen = 0;
}
@@
-771,7
+772,7
@@
static void collect_all_attrs(const char *path)
rem = attr_nr;
for (stk = attr_stack; 0 < rem && stk; stk = stk->prev)
rem = attr_nr;
for (stk = attr_stack; 0 < rem && stk; stk = stk->prev)
- rem = fill(path, pathlen, basename, stk, rem);
+ rem = fill(path, pathlen, basename
_offset
, stk, rem);
}
int git_check_attr(const char *path, int num, struct git_attr_check *check)
}
int git_check_attr(const char *path, int num, struct git_attr_check *check)