From: "\"Jan H. Schönherr\"" <schnhrr@cs.tu-berlin.de>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
rene.scharfe@lsrfire.ath.cx, Johannes Sixt <j6t@kdbg.org>,
torvalds@linux-foundation.org
Subject: Re: [PATCH] wildmatch: correct isprint and isspace
Date: Thu, 15 Nov 2012 18:13:25 +0100 [thread overview]
Message-ID: <50A522B5.7080206@cs.tu-berlin.de> (raw)
In-Reply-To: <1352981983-22005-1-git-send-email-pclouds@gmail.com>
Am 15.11.2012 13:19, schrieb Nguyễn Thái Ngọc Duy:
> On Thu, Nov 15, 2012 at 2:30 AM, René Scharfe <rene.scharfe@lsrfire.ath.cx> wrote:
> > Nevertheless, it's unfortunate that we have an isspace() that *almost* does
> > what the widely known thing of the same name does. I'd shy away from
> > changing git's version directly, because it's used more than a hundred times
> > in the code, and estimating the impact of adding \v and \f to it.
> > Perhaps renaming it to isgitspace() is a good first step, followed by
> > adding a "standard" version of isspace() for wildmatch?
>
> There are just too many call sites of isspace() and there is a risk
> of new call sites coming in independently. So I think keeping isspace()
> as-is and using a different name for the standard version is probably
> a better choice.
After having a closer look, where wildmatch is actually used -- matching
filenames -- and I've not yet seen \v or \f in a filename, it's possibly
unnecessary to do anything about isspace() right now.
(It's probably more an issue that filenames can be localized, and we only
support unlocalized character classes.)
> diff --git a/git-compat-util.h b/git-compat-util.h
> index 02f48f6..d4c3fda 100644
> --- a/git-compat-util.h
> +++ b/git-compat-util.h
> @@ -486,6 +486,7 @@ extern const unsigned char sane_ctype[256];
> #define sane_istest(x,mask) ((sane_ctype[(unsigned char)(x)] & (mask)) != 0)
> #define isascii(x) (((x) & ~0x7f) == 0)
> #define isspace(x) sane_istest(x,GIT_SPACE)
> +#define isspace_posix(x) (((x) >= 9 && (x) <= 13) || (x) == 32)
> #define isdigit(x) sane_istest(x,GIT_DIGIT)
> #define isalpha(x) sane_istest(x,GIT_ALPHA)
> #define isalnum(x) sane_istest(x,GIT_ALPHA | GIT_DIGIT)
> @@ -499,7 +500,8 @@ extern const unsigned char sane_ctype[256];
> #define isxdigit(x) (hexval_table[x] != -1)
This was from a previous patch, but maybe: "hexval_table[(unsigned char)x]"
> #define isprint(x) (sane_istest(x, GIT_ALPHA | GIT_DIGIT | GIT_SPACE | \
> GIT_PUNCT | GIT_REGEX_SPECIAL | GIT_GLOB_SPECIAL | \
> - GIT_PATHSPEC_MAGIC))
> + GIT_PATHSPEC_MAGIC) && \
> + (x) >= 32)
May I suggest the current is_print() implementation in master:
#define isprint(x) ((x) >= 0x20 && (x) <= 0x7e)
To summarize my opinion:
I no longer see a reason to correct isspace() (unless somebody with an actual
use case complains), and a more POSIXly isprint() is already in master.
=> Nothing to do. :)
Regards
Jan
next prev parent reply other threads:[~2012-11-15 17:13 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-14 2:34 [PATCH v5 00/12] nd/wildmatch Nguyễn Thái Ngọc Duy
2012-10-14 2:34 ` [PATCH v5 01/12] ctype: make sane_ctype[] const array Nguyễn Thái Ngọc Duy
2012-10-14 2:35 ` [PATCH v5 02/12] ctype: support iscntrl, ispunct, isxdigit and isprint Nguyễn Thái Ngọc Duy
2012-10-14 5:02 ` Junio C Hamano
2012-10-14 5:07 ` Nguyen Thai Ngoc Duy
2012-10-14 12:59 ` René Scharfe
2012-10-14 13:25 ` Nguyen Thai Ngoc Duy
2012-10-14 13:59 ` René Scharfe
2012-10-14 14:26 ` Nguyen Thai Ngoc Duy
2012-10-17 12:09 ` "Jan H. Schönherr"
2012-10-17 12:26 ` Nguyen Thai Ngoc Duy
2012-11-13 10:46 ` [PATCH nd/wildmatch] Correct Git's version of isprint and isspace Nguyễn Thái Ngọc Duy
2012-11-13 18:58 ` "Jan H. Schönherr"
2012-11-13 19:14 ` René Scharfe
2012-11-13 19:15 ` René Scharfe
2012-11-13 19:40 ` Linus Torvalds
2012-11-13 19:50 ` Linus Torvalds
2012-11-14 19:30 ` René Scharfe
2012-11-13 19:41 ` Johannes Sixt
2012-11-15 12:19 ` [PATCH] wildmatch: correct " Nguyễn Thái Ngọc Duy
2012-11-15 17:13 ` "Jan H. Schönherr" [this message]
2012-11-16 4:19 ` Nguyen Thai Ngoc Duy
2012-10-14 2:35 ` [PATCH v5 03/12] Import wildmatch from rsync Nguyễn Thái Ngọc Duy
2012-10-14 2:35 ` [PATCH v5 04/12] wildmatch: remove unnecessary functions Nguyễn Thái Ngọc Duy
2012-10-14 5:04 ` Junio C Hamano
2012-10-14 6:29 ` Nguyen Thai Ngoc Duy
2012-10-14 2:35 ` [PATCH v5 05/12] Integrate wildmatch to git Nguyễn Thái Ngọc Duy
2012-10-14 5:06 ` Junio C Hamano
2012-10-14 11:07 ` Torsten Bögershausen
2012-10-14 2:35 ` [PATCH v5 06/12] t3070: disable unreliable fnmatch tests Nguyễn Thái Ngọc Duy
2012-10-14 2:35 ` [PATCH v5 07/12] wildmatch: make wildmatch's return value compatible with fnmatch Nguyễn Thái Ngọc Duy
2012-10-14 5:09 ` Junio C Hamano
2012-10-14 2:35 ` [PATCH v5 08/12] wildmatch: remove static variable force_lower_case Nguyễn Thái Ngọc Duy
2012-10-14 2:35 ` [PATCH v5 09/12] wildmatch: fix case-insensitive matching Nguyễn Thái Ngọc Duy
2012-10-14 2:35 ` [PATCH v5 10/12] wildmatch: adjust "**" behavior Nguyễn Thái Ngọc Duy
2012-10-14 2:35 ` [PATCH v5 11/12] wildmatch: make /**/ match zero or more directories Nguyễn Thái Ngọc Duy
2012-10-14 2:35 ` [PATCH v5 12/12] Support "**" wildcard in .gitignore and .gitattributes Nguyễn Thái Ngọc 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=50A522B5.7080206@cs.tu-berlin.de \
--to=schnhrr@cs.tu-berlin.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=pclouds@gmail.com \
--cc=rene.scharfe@lsrfire.ath.cx \
--cc=torvalds@linux-foundation.org \
/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).