Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> writes: > Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> > --- The description to justify why it is ctype2[] seems to have been lost. Intended? > ctype.c | 18 ++++++++++++++++++ > git-compat-util.h | 13 +++++++++++++ > 2 files changed, 31 insertions(+) > > diff --git a/ctype.c b/ctype.c > index faeaf34..b4bf48a 100644 > --- a/ctype.c > +++ b/ctype.c > @@ -26,6 +26,24 @@ const unsigned char sane_ctype[256] = { > /* Nothing in the 128.. range */ > }; > > +enum { > + CN = GIT_CNTRL, > + PU = GIT_PUNCT, > + XD = GIT_XDIGIT, > +}; > + > +const unsigned char sane_ctype2[256] = { > + CN, CN, CN, CN, CN, CN, CN, CN, CN, CN, CN, CN, CN, CN, CN, CN, /* 0..15 */ > + CN, CN, CN, CN, CN, CN, CN, CN, CN, CN, CN, CN, CN, CN, CN, CN, /* 16..31 */ > + 0, PU, PU, PU, PU, PU, PU, PU, PU, PU, PU, PU, PU, PU, PU, PU, /* 32..47 */ > + XD, XD, XD, XD, XD, XD, XD, XD, XD, XD, PU, PU, PU, PU, PU, PU, /* 48..63 */ > + PU, 0, XD, 0, XD, 0, XD, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 64..79 */ > + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, PU, PU, PU, PU, PU, /* 80..95 */ > + PU, 0, XD, 0, XD, 0, XD, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 96..111 */ > + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, PU, PU, PU, PU, CN, /* 112..127 */ > + /* Nothing in the 128.. range */ > +}; > + > /* For case-insensitive kwset */ > const char tolower_trans_tbl[256] = { > 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, > diff --git a/git-compat-util.h b/git-compat-util.h > index f8b859c..ea11694 100644 > --- a/git-compat-util.h > +++ b/git-compat-util.h > @@ -510,14 +510,23 @@ extern const char tolower_trans_tbl[256]; > #undef isupper > #undef tolower > #undef toupper > +#undef iscntrl > +#undef ispunct > +#undef isxdigit > +#undef isprint > extern const unsigned char sane_ctype[256]; > +extern const unsigned char sane_ctype2[256]; > #define GIT_SPACE 0x01 > #define GIT_DIGIT 0x02 > #define GIT_ALPHA 0x04 > #define GIT_GLOB_SPECIAL 0x08 > #define GIT_REGEX_SPECIAL 0x10 > #define GIT_PATHSPEC_MAGIC 0x20 > +#define GIT_CNTRL 0x01 > +#define GIT_PUNCT 0x02 > +#define GIT_XDIGIT 0x04 > #define sane_istest(x,mask) ((sane_ctype[(unsigned char)(x)] & (mask)) != 0) > +#define sane_istest2(x,mask) ((sane_ctype2[(unsigned char)(x)] & (mask)) != 0) > #define isascii(x) (((x) & ~0x7f) == 0) > #define isspace(x) sane_istest(x,GIT_SPACE) > #define isdigit(x) sane_istest(x,GIT_DIGIT) > @@ -527,6 +536,10 @@ extern const unsigned char sane_ctype[256]; > #define isupper(x) sane_iscase(x, 0) > #define is_glob_special(x) sane_istest(x,GIT_GLOB_SPECIAL) > #define is_regex_special(x) sane_istest(x,GIT_GLOB_SPECIAL | GIT_REGEX_SPECIAL) > +#define iscntrl(x) sane_istest2(x, GIT_CNTRL) > +#define ispunct(x) sane_istest2(x, GIT_PUNCT) > +#define isxdigit(x) sane_istest2(x, GIT_XDIGIT) > +#define isprint(x) (isalnum(x) || isspace(x) || ispunct(x)) > #define tolower(x) sane_case((unsigned char)(x), 0x20) > #define toupper(x) sane_case((unsigned char)(x), 0) > #define is_pathspec_magic(x) sane_istest(x,GIT_PATHSPEC_MAGIC) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html