From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: pclouds@gmail.com, peff@peff.net, avila.jn@gmail.com
Subject: [PATCH 1/4] attr.c::path_matches(): the basename is part of the pathname
Date: Tue, 26 Mar 2013 11:39:28 -0700 [thread overview]
Message-ID: <1364323171-20299-2-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1364323171-20299-1-git-send-email-gitster@pobox.com>
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 | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/attr.c b/attr.c
index ab2aab2..4cfe0ee 100644
--- 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,
- const char *basename,
+ int basename_offset,
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 match_basename(basename,
- pathlen - (basename - pathname),
+ return match_basename(pathname + basename_offset,
+ pathlen - basename_offset,
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;
}
-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;
@@ -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;
- 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);
}
@@ -750,7 +750,8 @@ static void collect_all_attrs(const char *path)
{
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])
@@ -758,10 +759,10 @@ static void collect_all_attrs(const char *path)
}
pathlen = cp - path;
if (last_slash) {
- basename = last_slash + 1;
+ basename_offset = last_slash + 1 - path;
dirlen = last_slash - path;
} else {
- basename = path;
+ basename_offset = 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 = 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)
--
1.8.2-350-g3df87a1
next prev parent reply other threads:[~2013-03-26 18:40 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-19 17:57 [regression?] trailing slash required in .gitattributes Jeff King
2013-03-19 18:10 ` Junio C Hamano
2013-03-19 18:10 ` Jeff King
2013-03-22 22:24 ` Jeff King
2013-03-22 23:08 ` Junio C Hamano
2013-03-23 8:39 ` Jeff King
2013-03-24 5:25 ` Junio C Hamano
2013-03-26 18:39 ` [PATCH 0/4] attribute regression fix for maint-1.8.1 and upward Junio C Hamano
2013-03-26 18:39 ` Junio C Hamano [this message]
2013-03-26 18:49 ` [PATCH 1/4] attr.c::path_matches(): the basename is part of the pathname Jeff King
2013-03-27 1:40 ` Duy Nguyen
2013-03-26 18:39 ` [PATCH 2/4] dir.c::match_basename(): pay attention to the length of string parameters Junio C Hamano
2013-03-26 18:55 ` Jeff King
2013-03-26 20:39 ` Jeff King
2013-03-26 20:49 ` Junio C Hamano
2013-03-26 21:29 ` Jeff King
2013-03-26 22:33 ` Junio C Hamano
2013-03-27 1:04 ` Jeff King
2013-03-26 18:39 ` [PATCH 3/4] attr.c::path_matches(): special case paths that end with a slash Junio C Hamano
2013-03-26 19:05 ` Jeff King
2013-03-26 21:33 ` Jeff King
2013-03-27 1:30 ` Duy Nguyen
2013-03-28 19:49 ` Jeff King
2013-03-26 18:39 ` [PATCH 4/4] make sure a pattern without trailing slash matches a directory Junio C Hamano
2013-03-26 19:08 ` Jeff King
2013-03-27 1:13 ` [PATCH 0/4] attribute regression fix for maint-1.8.1 and upward Duy Nguyen
2013-03-27 3:57 ` Junio C Hamano
2013-03-27 4:01 ` Duy Nguyen
2013-03-28 21:43 ` [PATCH v2 0/6] " Jeff King
2013-03-28 21:45 ` [PATCH 1/6] attr.c::path_matches(): the basename is part of the pathname Jeff King
2013-03-28 21:47 ` [PATCH 2/6] dir.c::match_basename(): pay attention to the length of string parameters Jeff King
2013-03-28 22:40 ` Jeff King
2013-03-28 22:49 ` Jeff King
2013-03-28 23:10 ` Junio C Hamano
2013-03-28 23:40 ` Duy Nguyen
2013-03-29 1:25 ` Duy Nguyen
2013-03-29 3:02 ` Jeff King
2013-03-29 5:57 ` Junio C Hamano
2013-03-28 21:47 ` [PATCH 3/6] dir.c::match_pathname(): adjust patternlen when shifting pattern Jeff King
2013-03-28 21:48 ` [PATCH 4/6] dir.c::match_pathname(): pay attention to the length of string parameters Jeff King
2013-03-28 22:30 ` Junio C Hamano
2013-03-29 8:45 ` Duy Nguyen
2013-03-29 10:03 ` Duy Nguyen
2013-03-29 11:32 ` Torsten Bögershausen
2013-03-29 11:37 ` Duy Nguyen
2013-03-29 12:05 ` Jeff King
2013-03-29 13:02 ` Duy Nguyen
2013-03-29 16:44 ` Junio C Hamano
2013-03-29 17:04 ` Jeff King
2013-03-29 17:35 ` Junio C Hamano
2013-03-29 17:44 ` Jeff King
2013-03-30 1:40 ` Duy Nguyen
2013-03-28 21:49 ` [PATCH 5/6] attr.c::path_matches(): special case paths that end with a slash Jeff King
2013-03-28 21:50 ` [PATCH 6/6] t: check that a pattern without trailing slash matches a directory Jeff King
2013-03-28 22:21 ` Eric Sunshine
2013-03-28 22:22 ` Jeff King
2013-03-23 4:18 ` [regression?] trailing slash required in .gitattributes Duy Nguyen
2013-03-23 4:43 ` Duy Nguyen
2013-03-25 6:05 ` [PATCH 0/4] attr directory matching regression Nguyễn Thái Ngọc Duy
2013-03-25 6:05 ` [PATCH 1/4] wildmatch: do not require "text" to be NUL-terminated Nguyễn Thái Ngọc Duy
2013-03-25 6:05 ` [PATCH 2/4] attr.c: fix pattern{,len} inconsistency in struct match_attr Nguyễn Thái Ngọc Duy
2013-03-25 6:05 ` [PATCH 3/4] dir.c: make match_{base,path}name respect {basename,path}len Nguyễn Thái Ngọc Duy
2013-03-25 6:05 ` [PATCH 4/4] attr.c: fix matching "subdir" without the trailing slash Nguyễn Thái Ngọc Duy
2013-03-25 7:20 ` Duy Nguyen
2013-03-25 9:24 ` Duy Nguyen
2013-03-26 15:10 ` [PATCH 0/4] attr directory matching regression Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364323171-20299-2-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=avila.jn@gmail.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).