mirror of
https://github.com/git/git
synced 2024-11-04 16:17:49 +00:00
sane-ctype.h: create header for sane-ctype macros
Splitting these macros from git-compat-util.h cleans up the file and allows future third-party sources to not use these overrides if they do not wish to. Signed-off-by: Calvin Wan <calvinwan@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Calvin Wan
Junio C Hamano
parent
382f6940af
commit
1890ce84bd
2 changed files with 67 additions and 61 deletions
|
|
@ -1153,67 +1153,7 @@ static inline size_t xsize_t(off_t len)
|
||||||
/* in ctype.c, for kwset users */
|
/* in ctype.c, for kwset users */
|
||||||
extern const unsigned char tolower_trans_tbl[256];
|
extern const unsigned char tolower_trans_tbl[256];
|
||||||
|
|
||||||
/* Sane ctype - no locale, and works with signed chars */
|
#include "sane-ctype.h"
|
||||||
#undef isascii
|
|
||||||
#undef isspace
|
|
||||||
#undef isdigit
|
|
||||||
#undef isalpha
|
|
||||||
#undef isalnum
|
|
||||||
#undef isprint
|
|
||||||
#undef islower
|
|
||||||
#undef isupper
|
|
||||||
#undef tolower
|
|
||||||
#undef toupper
|
|
||||||
#undef iscntrl
|
|
||||||
#undef ispunct
|
|
||||||
#undef isxdigit
|
|
||||||
|
|
||||||
extern const unsigned char sane_ctype[256];
|
|
||||||
extern const signed char hexval_table[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 0x40
|
|
||||||
#define GIT_PUNCT 0x80
|
|
||||||
#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 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)
|
|
||||||
#define isprint(x) ((x) >= 0x20 && (x) <= 0x7e)
|
|
||||||
#define islower(x) sane_iscase(x, 1)
|
|
||||||
#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_istest(x,GIT_CNTRL))
|
|
||||||
#define ispunct(x) sane_istest(x, GIT_PUNCT | GIT_REGEX_SPECIAL | \
|
|
||||||
GIT_GLOB_SPECIAL | GIT_PATHSPEC_MAGIC)
|
|
||||||
#define isxdigit(x) (hexval_table[(unsigned char)(x)] != -1)
|
|
||||||
#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)
|
|
||||||
|
|
||||||
static inline int sane_case(int x, int high)
|
|
||||||
{
|
|
||||||
if (sane_istest(x, GIT_ALPHA))
|
|
||||||
x = (x & ~0x20) | high;
|
|
||||||
return x;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline int sane_iscase(int x, int is_lower)
|
|
||||||
{
|
|
||||||
if (!sane_istest(x, GIT_ALPHA))
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (is_lower)
|
|
||||||
return (x & 0x20) != 0;
|
|
||||||
else
|
|
||||||
return (x & 0x20) == 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Like skip_prefix, but compare case-insensitively. Note that the comparison
|
* Like skip_prefix, but compare case-insensitively. Note that the comparison
|
||||||
|
|
|
||||||
66
sane-ctype.h
Normal file
66
sane-ctype.h
Normal file
|
|
@ -0,0 +1,66 @@
|
||||||
|
#ifndef SANE_CTYPE_H
|
||||||
|
#define SANE_CTYPE_H
|
||||||
|
|
||||||
|
/* Sane ctype - no locale, and works with signed chars */
|
||||||
|
#undef isascii
|
||||||
|
#undef isspace
|
||||||
|
#undef isdigit
|
||||||
|
#undef isalpha
|
||||||
|
#undef isalnum
|
||||||
|
#undef isprint
|
||||||
|
#undef islower
|
||||||
|
#undef isupper
|
||||||
|
#undef tolower
|
||||||
|
#undef toupper
|
||||||
|
#undef iscntrl
|
||||||
|
#undef ispunct
|
||||||
|
#undef isxdigit
|
||||||
|
|
||||||
|
extern const unsigned char sane_ctype[256];
|
||||||
|
extern const signed char hexval_table[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 0x40
|
||||||
|
#define GIT_PUNCT 0x80
|
||||||
|
#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 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)
|
||||||
|
#define isprint(x) ((x) >= 0x20 && (x) <= 0x7e)
|
||||||
|
#define islower(x) sane_iscase(x, 1)
|
||||||
|
#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_istest(x,GIT_CNTRL))
|
||||||
|
#define ispunct(x) sane_istest(x, GIT_PUNCT | GIT_REGEX_SPECIAL | \
|
||||||
|
GIT_GLOB_SPECIAL | GIT_PATHSPEC_MAGIC)
|
||||||
|
#define isxdigit(x) (hexval_table[(unsigned char)(x)] != -1)
|
||||||
|
#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)
|
||||||
|
|
||||||
|
static inline int sane_case(int x, int high)
|
||||||
|
{
|
||||||
|
if (sane_istest(x, GIT_ALPHA))
|
||||||
|
x = (x & ~0x20) | high;
|
||||||
|
return x;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline int sane_iscase(int x, int is_lower)
|
||||||
|
{
|
||||||
|
if (!sane_istest(x, GIT_ALPHA))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (is_lower)
|
||||||
|
return (x & 0x20) != 0;
|
||||||
|
else
|
||||||
|
return (x & 0x20) == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
Loading…
Reference in a new issue