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 06/12] wildmatch: make wildmatch's return value compatible with fnmatch
Date: Wed, 10 Oct 2012 17:40:45 +0700 [thread overview]
Message-ID: <1349865651-31889-7-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1349865651-31889-1-git-send-email-pclouds@gmail.com>
wildmatch returns non-zero if matched, zero otherwise. This patch
makes it return zero if matches, non-zero otherwise, like fnmatch().
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
test-wildmatch.c | 4 ++--
wildmatch.c | 21 ++++++++++++---------
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/test-wildmatch.c b/test-wildmatch.c
index 08962d5..596029c 100644
--- a/test-wildmatch.c
+++ b/test-wildmatch.c
@@ -4,9 +4,9 @@
int main(int argc, char **argv)
{
if (!strcmp(argv[1], "wildmatch"))
- return wildmatch(argv[3], argv[2]) ? 0 : 1;
+ return wildmatch(argv[3], argv[2]);
else if (!strcmp(argv[1], "iwildmatch"))
- return iwildmatch(argv[3], argv[2]) ? 0 : 1;
+ return iwildmatch(argv[3], argv[2]);
else if (!strcmp(argv[1], "fnmatch"))
return fnmatch(argv[3], argv[2], FNM_PATHNAME);
else
diff --git a/wildmatch.c b/wildmatch.c
index 6092bde..7c180e3 100644
--- a/wildmatch.c
+++ b/wildmatch.c
@@ -20,6 +20,9 @@ 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
@@ -79,12 +82,12 @@ static int dowild(const uchar *p, const uchar *text)
/* FALLTHROUGH */
default:
if (t_ch != p_ch)
- return FALSE;
+ return NOMATCH;
continue;
case '?':
/* Match anything but '/'. */
if (t_ch == '/')
- return FALSE;
+ return NOMATCH;
continue;
case '*':
if (*++p == '*') {
@@ -97,14 +100,14 @@ static int dowild(const uchar *p, const uchar *text)
* only if there are no more slash characters. */
if (!special) {
if (strchr((char*)text, '/') != NULL)
- return FALSE;
+ return NOMATCH;
}
- return TRUE;
+ return MATCH;
}
while (1) {
if (t_ch == '\0')
break;
- if ((matched = dowild(p, text)) != FALSE) {
+ if ((matched = dowild(p, text)) != NOMATCH) {
if (!special || matched != ABORT_TO_STARSTAR)
return matched;
} else if (!special && t_ch == '/')
@@ -203,18 +206,18 @@ static int dowild(const uchar *p, const uchar *text)
matched = TRUE;
} while (prev_ch = p_ch, (p_ch = *++p) != ']');
if (matched == special || t_ch == '/')
- return FALSE;
+ return NOMATCH;
continue;
}
}
- return *text ? FALSE : TRUE;
+ return *text ? NOMATCH : MATCH;
}
/* Match the "pattern" against the "text" string. */
int wildmatch(const char *pattern, const char *text)
{
- return dowild((const uchar*)pattern, (const uchar*)text) == TRUE;
+ return dowild((const uchar*)pattern, (const uchar*)text);
}
/* Match the "pattern" against the forced-to-lower-case "text" string. */
@@ -222,7 +225,7 @@ int iwildmatch(const char *pattern, const char *text)
{
int ret;
force_lower_case = 1;
- ret = dowild((const uchar*)pattern, (const uchar*)text) == TRUE;
+ ret = dowild((const uchar*)pattern, (const uchar*)text);
force_lower_case = 0;
return ret;
}
--
1.7.12.1.406.g6ab07c4
next prev parent reply other threads:[~2012-10-10 10:41 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 ` Nguyễn Thái Ngọc Duy [this message]
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 ` [PATCH v4 09/12] wildmatch: adjust "**" behavior Nguyễn Thái Ngọc Duy
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-7-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).