From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Michael Haggerty" <mhagger@alum.mit.edu>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v4 09/12] wildmatch: adjust "**" behavior
Date: Wed, 10 Oct 2012 17:40:48 +0700 [thread overview]
Message-ID: <1349865651-31889-10-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1349865651-31889-1-git-send-email-pclouds@gmail.com>
Standard wildmatch() sees consecutive asterisks as "*" that can also
match slashes. But that may be hard to explain to users as
"abc/**/def" can match "abcdef", "abcxyzdef", "abc/def", "abc/x/def",
"abc/x/y/def"...
This patch changes wildmatch so that users can do
- "**/def" -> all paths ending with file/directory 'def'
- "abc/**" - equivalent to "/abc/"
- "abc/**/def" -> "abc/x/def", "abc/x/y/def"...
- otherwise consider the pattern malformed if "**" is found
Basically the magic of "**" only remains if it's wrapped around by
slashes.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
t/t3070-wildmatch.sh | 5 +++--
wildmatch.c | 13 +++++++------
wildmatch.h | 6 ++++++
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/t/t3070-wildmatch.sh b/t/t3070-wildmatch.sh
index bb92f8d..f6c64be 100755
--- a/t/t3070-wildmatch.sh
+++ b/t/t3070-wildmatch.sh
@@ -36,7 +36,7 @@ match 0 0 foobar 'foo\*bar'
match 1 1 'f\oo' 'f\\oo'
match 1 1 ball '*[al]?'
match 0 0 ten '[ten]'
-match 1 1 ten '**[!te]'
+match 0 1 ten '**[!te]'
match 0 0 ten '**[!ten]'
match 1 1 ten 't[a-g]n'
match 0 0 ten 't[!a-g]n'
@@ -51,7 +51,8 @@ match 1 1 ']' ']'
# Extended slash-matching features
match 0 0 'foo/baz/bar' 'foo*bar'
-match 1 0 'foo/baz/bar' 'foo**bar'
+match 0 0 'foo/baz/bar' 'foo**bar'
+match 0 1 'foobazbar' 'foo**bar'
match 0 0 'foo/bar' 'foo?bar'
match 0 0 'foo/bar' 'foo[/]bar'
match 0 0 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
diff --git a/wildmatch.c b/wildmatch.c
index b700631..e09a459 100644
--- a/wildmatch.c
+++ b/wildmatch.c
@@ -21,11 +21,6 @@ typedef unsigned char uchar;
#define FALSE 0
#define TRUE 1
-#define NOMATCH 1
-#define MATCH 0
-#define ABORT_ALL -1
-#define ABORT_TO_STARSTAR -2
-
#define CC_EQ(class, len, litmatch) ((len) == sizeof (litmatch)-1 \
&& *(class) == *(litmatch) \
&& strncmp((char*)class, litmatch, len) == 0)
@@ -91,8 +86,14 @@ static int dowild(const uchar *p, const uchar *text, int force_lower_case)
continue;
case '*':
if (*++p == '*') {
+ const uchar *prev_p = p - 2;
while (*++p == '*') {}
- special = TRUE;
+ if ((prev_p == text || *prev_p == '/') ||
+ (*p == '\0' || *p == '/' ||
+ (p[0] == '\\' && p[1] == '/'))) {
+ special = TRUE;
+ } else
+ return ABORT_MALFORMED;
} else
special = FALSE;
if (*p == '\0') {
diff --git a/wildmatch.h b/wildmatch.h
index e974f9a..984a38c 100644
--- a/wildmatch.h
+++ b/wildmatch.h
@@ -1,3 +1,9 @@
/* wildmatch.h */
+#define ABORT_MALFORMED 2
+#define NOMATCH 1
+#define MATCH 0
+#define ABORT_ALL -1
+#define ABORT_TO_STARSTAR -2
+
int wildmatch(const char *pattern, const char *text, int flags);
--
1.7.12.1.406.g6ab07c4
next prev parent reply other threads:[~2012-10-10 10:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-10 10:40 [PATCH v4 00/12] Wildmatch v4 Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 01/12] ctype: make sane_ctype[] const array Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 02/12] ctype: support iscntrl, ispunct, isxdigit and isprint Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 03/12] Import wildmatch from rsync Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 04/12] wildmatch: remove unnecessary functions Nguyễn Thái Ngọc Duy
2012-10-10 15:38 ` Michael Haggerty
2012-10-10 10:40 ` [PATCH v4 05/12] Integrate wildmatch to git Nguyễn Thái Ngọc Duy
2012-10-12 7:27 ` Johannes Sixt
2012-10-12 17:30 ` Junio C Hamano
2012-10-10 10:40 ` [PATCH v4 06/12] wildmatch: make wildmatch's return value compatible with fnmatch Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 07/12] wildmatch: remove static variable force_lower_case Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 08/12] wildmatch: fix case-insensitive matching Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` Nguyễn Thái Ngọc Duy [this message]
2012-10-10 10:40 ` [PATCH v4 10/12] wildmatch: make /**/ match zero or more directories Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 11/12] Support "**" wildcard in .gitignore and .gitattributes Nguyễn Thái Ngọc Duy
2012-10-10 10:40 ` [PATCH v4 12/12] t3070: disable two fnmatch tests that have different results on different libc Nguyễn Thái Ngọc Duy
2012-10-12 7:22 ` Johannes Sixt
2012-10-12 9:49 ` Nguyen Thai Ngoc Duy
2012-10-10 23:48 ` [PATCH v4 00/12] Wildmatch v4 Junio C Hamano
2012-10-11 4:33 ` Junio C Hamano
2012-10-11 11:56 ` Nguyen Thai Ngoc Duy
2012-10-11 16:09 ` Junio C Hamano
2012-10-11 17:09 ` Junio C Hamano
2012-10-11 23:50 ` Junio C Hamano
2012-10-12 16:44 ` Torsten Bögershausen
2012-10-12 17:05 ` Junio C Hamano
2012-10-12 20:28 ` Torsten Bögershausen
2012-10-13 3:49 ` Nguyen Thai Ngoc Duy
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1349865651-31889-10-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).