mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-05-09 00:56:17 +02:00
Code

51212: remove STOUC() macro 

This served as a workaround for ancient compilers where casts to
unsigned char were broken.
This commit is contained in:
Oliver Kiddle 2022-12-16 23:22:33 +01:00
parent 7fb6c133bf
commit a73c705b0c
34 changed files with 192 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,5 +1,17 @@
2022-12-16 Oliver Kiddle <opk@zsh.org> 2022-12-16 Oliver Kiddle <opk@zsh.org>
* 51212: Etc/zsh-development-guide, Src/Modules/curses.c,
Src/Modules/stat.c, Src/Modules/zftp.c, Src/Modules/zpty.c,
Src/Modules/zutil.c, Src/Zle/compcore.c, Src/Zle/complete.c,
Src/Zle/complist.c, Src/Zle/zle.h, Src/Zle/zle_keymap.c,
Src/Zle/zle_main.c, Src/Zle/zle_thingy.c, Src/Zle/zle_utils.c,
Src/builtin.c, Src/exec.c, Src/glob.c, Src/hist.c, Src/init.c,
Src/input.c, Src/lex.c, Src/math.c, Src/module.c, Src/params.c,
Src/parse.c, Src/pattern.c, Src/prompt.c, Src/sort.c, Src/subst.c,
Src/utils.c, Src/zsh.h, Src/ztype.h, configure.ac: remove STOUC()
macro which served as a workaround for ancient compilers where
casts to unsigned char were broken
* 51215: Src/Zle/zle_keymap.c, Test/X03zlebindkey.ztst, * 51215: Src/Zle/zle_keymap.c, Test/X03zlebindkey.ztst,
Test/X02zlevi.ztst: consume whole CSI sequences from the input Test/X02zlevi.ztst: consume whole CSI sequences from the input
even where they aren't explicitly bound even where they aren't explicitly bound

3
Etc/zsh-development-guide
View File

@ -223,9 +223,6 @@ C coding style
* Do not use space between the function name and the opening parenthesis. * Do not use space between the function name and the opening parenthesis.
Use space after if/for/while. Use space after type casts. Use space after if/for/while. Use space after type casts.
* Do not use (unsigned char) casts since some compilers do not handle
them properly. Use the provided STOUC(X) macro instead.
* If you use emacs 19.30 or newer you can put the following line to your * If you use emacs 19.30 or newer you can put the following line to your
~/.emacs file to make these formatting rules the default: ~/.emacs file to make these formatting rules the default:

4
Src/Modules/curses.c
View File

@ -1426,10 +1426,10 @@ zccmd_querychar(const char *nam, char **args)
inc &= A_CHARTEXT; inc &= A_CHARTEXT;
if (imeta(inc)) { if (imeta(inc)) {
instr[0] = Meta; instr[0] = Meta;
instr[1] = STOUC(inc ^ 32); instr[1] = (unsigned char) (inc ^ 32);
instr[2] = '\0'; instr[2] = '\0';
} else { } else {
instr[0] = STOUC(inc); instr[0] = (unsigned char) inc;
instr[1] = '\0'; instr[1] = '\0';
} }
attrs = inc; attrs = inc;

2
Src/Modules/stat.c
View File

@ -406,7 +406,7 @@ bin_stat(char *name, char **args, Options ops, UNUSED(int func))
} else { } else {
for (; *arg; arg++) { for (; *arg; arg++) {
if (strchr("glLnNorstT", *arg)) if (strchr("glLnNorstT", *arg))
ops->ind[STOUC(*arg)] = 1; ops->ind[(unsigned char) *arg] = 1;
else if (*arg == 'A') { else if (*arg == 'A') {
if (arg[1]) { if (arg[1]) {
arrnam = arg+1; arrnam = arg+1;

12
Src/Modules/zftp.c
View File

@ -944,9 +944,9 @@ zfopendata(char *name, union tcp_sockaddr *zdsockp, int *is_passivep)
return 1; return 1;
} }
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
iaddr[i] = STOUC(nums[i]); iaddr[i] = (unsigned char) nums[i];
iport[0] = STOUC(nums[4]); iport[0] = (unsigned char) nums[4];
iport[1] = STOUC(nums[5]); iport[1] = (unsigned char) nums[5];
memcpy(&zdsockp->in.sin_addr, iaddr, sizeof(iaddr)); memcpy(&zdsockp->in.sin_addr, iaddr, sizeof(iaddr));
memcpy(&zdsockp->in.sin_port, iport, sizeof(iport)); memcpy(&zdsockp->in.sin_port, iport, sizeof(iport));
@ -2438,7 +2438,7 @@ zftp_type(char *name, char **args, int flags)
fflush(stdout); fflush(stdout);
return 0; return 0;
} else { } else {
nt = toupper(STOUC(*str)); nt = toupper((unsigned char) *str);
/* /*
* RFC959 specifies other types, but these are the only * RFC959 specifies other types, but these are the only
* ones we know what to do with. * ones we know what to do with.
@ -2472,7 +2472,7 @@ zftp_mode(char *name, char **args, UNUSED(int flags))
fflush(stdout); fflush(stdout);
return 0; return 0;
} }
nt = str[0] = toupper(STOUC(*str)); nt = str[0] = toupper((unsigned char) *str);
if (str[1] || (nt != 'S' && nt != 'B')) { if (str[1] || (nt != 'S' && nt != 'B')) {
zwarnnam(name, "transfer mode %s not recognised", str); zwarnnam(name, "transfer mode %s not recognised", str);
return 1; return 1;
@ -3075,7 +3075,7 @@ bin_zftp(char *name, char **args, UNUSED(Options ops), UNUSED(int func))
if ((prefs = getsparam_u("ZFTP_PREFS"))) { if ((prefs = getsparam_u("ZFTP_PREFS"))) {
zfprefs = 0; zfprefs = 0;
for (ptr = prefs; *ptr; ptr++) { for (ptr = prefs; *ptr; ptr++) {
switch (toupper(STOUC(*ptr))) { switch (toupper((unsigned char) *ptr)) {
case 'S': case 'S':
/* sendport */ /* sendport */
zfprefs |= ZFPF_SNDP; zfprefs |= ZFPF_SNDP;

2
Src/Modules/zpty.c
View File

@ -638,7 +638,7 @@ ptyread(char *nam, Ptycmd cmd, char **args, int noblock, int mustmatch)
readchar = cmd->read; readchar = cmd->read;
cmd->read = -1; cmd->read = -1;
} else } else
readchar = STOUC(buf[used]); readchar = (unsigned char) buf[used];
if (imeta(readchar)) { if (imeta(readchar)) {
buf[used++] = Meta; buf[used++] = Meta;
buf[used++] = (char) (readchar ^ 32); buf[used++] = (char) (readchar ^ 32);

24
Src/Modules/zutil.c
View File

@ -795,11 +795,11 @@ static char *zformat_substring(char* instr, char **specs, char **outp,
if (idigit(*s)) { if (idigit(*s)) {
for (min = 0; idigit(*s); s++) for (min = 0; idigit(*s); s++)
min = (min * 10) + (int) STOUC(*s) - '0'; min = (min * 10) + (int) (unsigned char) *s - '0';
} }
/* Ternary expressions */ /* Ternary expressions */
testit = (STOUC(*s) == '('); testit = ((unsigned char) *s == '(');
if (testit && s[1] == '-') if (testit && s[1] == '-')
{ {
/* Allow %(-1... etc. */ /* Allow %(-1... etc. */
@ -808,25 +808,25 @@ static char *zformat_substring(char* instr, char **specs, char **outp,
} }
if ((*s == '.' || testit) && idigit(s[1])) { if ((*s == '.' || testit) && idigit(s[1])) {
for (max = 0, s++; idigit(*s); s++) for (max = 0, s++; idigit(*s); s++)
max = (max * 10) + (int) STOUC(*s) - '0'; max = (max * 10) + (int) (unsigned char) *s - '0';
} else if (*s == '.' || testit) } else if (*s == '.' || testit)
s++; s++;
if (testit && STOUC(*s)) { if (testit && (unsigned char) *s) {
int actval, testval, endcharl; int actval, testval, endcharl;
/* Only one number is useful for ternary expressions. */ /* Only one number is useful for ternary expressions. */
testval = (min >= 0) ? min : (max >= 0) ? max : 0; testval = (min >= 0) ? min : (max >= 0) ? max : 0;
if (specs[STOUC(*s)] && *specs[STOUC(*s)]) { if (specs[(unsigned char) *s] && *specs[(unsigned char) *s]) {
if (presence) { if (presence) {
if (testval) if (testval)
#ifdef MULTIBYTE_SUPPORT #ifdef MULTIBYTE_SUPPORT
if (isset(MULTIBYTE)) if (isset(MULTIBYTE))
actval = MB_METASTRWIDTH(specs[STOUC(*s)]); actval = MB_METASTRWIDTH(specs[(unsigned char) *s]);
else else
#endif #endif
actval = strlen(specs[STOUC(*s)]); actval = strlen(specs[(unsigned char) *s]);
else else
actval = 1; actval = 1;
actval = right ? (testval < actval) : (testval >= actval); actval = right ? (testval < actval) : (testval >= actval);
@ -834,7 +834,7 @@ static char *zformat_substring(char* instr, char **specs, char **outp,
if (right) /* put the sign back */ if (right) /* put the sign back */
testval *= -1; testval *= -1;
/* zero means values are equal, i.e. true */ /* zero means values are equal, i.e. true */
actval = (int)mathevali(specs[STOUC(*s)]) - testval; actval = (int) mathevali(specs[(unsigned char) *s]) - testval;
} }
} else } else
actval = presence ? !right : testval; actval = presence ? !right : testval;
@ -855,7 +855,7 @@ static char *zformat_substring(char* instr, char **specs, char **outp,
return NULL; return NULL;
} else if (skip) { } else if (skip) {
continue; continue;
} else if ((spec = specs[STOUC(*s)])) { } else if ((spec = specs[(unsigned char) *s])) {
int len; int len;
if ((len = strlen(spec)) > max && max >= 0) if ((len = strlen(spec)) > max && max >= 0)
@ -950,7 +950,7 @@ bin_zformat(char *nam, char **args, UNUSED(Options ops), UNUSED(int func))
zwarnnam(nam, "invalid argument: %s", *ap); zwarnnam(nam, "invalid argument: %s", *ap);
return 1; return 1;
} }
specs[STOUC(ap[0][0])] = ap[0] + 2; specs[(unsigned char) ap[0][0]] = ap[0] + 2;
} }
out = (char *) zhalloc(olen = 128); out = (char *) zhalloc(olen = 128);
@ -1864,7 +1864,7 @@ bin_zparseopts(char *nam, char **args, UNUSED(Options ops), UNUSED(int func))
d->vals = d->last = NULL; d->vals = d->last = NULL;
opt_descs = d; opt_descs = d;
if (!o[1]) if (!o[1])
sopts[STOUC(*o)] = d; sopts[(unsigned char) *o] = d;
if ((flags & ZOF_MAP) && !map_opt_desc(d)) { if ((flags & ZOF_MAP) && !map_opt_desc(d)) {
zwarnnam(nam, "cyclic option mapping: %s", args[-1]); zwarnnam(nam, "cyclic option mapping: %s", args[-1]);
return 1; return 1;
@ -1888,7 +1888,7 @@ bin_zparseopts(char *nam, char **args, UNUSED(Options ops), UNUSED(int func))
} }
if (!(d = lookup_opt(o + 1))) { if (!(d = lookup_opt(o + 1))) {
while (*++o) { while (*++o) {
if (!(d = sopts[STOUC(*o)])) { if (!(d = sopts[(unsigned char) *o])) {
if (fail) { if (fail) {
if (*o != '-') if (*o != '-')
zwarnnam(nam, "bad option: -%c", *o); zwarnnam(nam, "bad option: -%c", *o);

6
Src/Zle/compcore.c
View File

@ -2898,9 +2898,9 @@ add_match_data(int alt, char *str, char *orig, Cline line,
*t++ = '$'; *t++ = '$';
*t++ = '\''; *t++ = '\'';
*t++ = '\\'; *t++ = '\\';
*t++ = '0' + ((STOUC(curchar) >> 6) & 7); *t++ = '0' + (((unsigned char) curchar >> 6) & 7);
*t++ = '0' + ((STOUC(curchar) >> 3) & 7); *t++ = '0' + (((unsigned char) curchar >> 3) & 7);
*t++ = '0' + (STOUC(curchar) & 7); *t++ = '0' + ((unsigned char) curchar & 7);
*t++ = '\''; *t++ = '\'';
} while (cnt == MB_INCOMPLETE && fs < fe); } while (cnt == MB_INCOMPLETE && fs < fe);
/* Scanning restarts from the spot after the char we skipped. */ /* Scanning restarts from the spot after the char we skipped. */

2
Src/Zle/complete.c
View File

@ -518,7 +518,7 @@ parse_class(Cpattern p, char *iptr)
ch = range_type((char *)iptr, nptr-iptr); ch = range_type((char *)iptr, nptr-iptr);
iptr = nptr + 2; iptr = nptr + 2;
if (ch != PP_UNKWN) if (ch != PP_UNKWN)
*optr++ = STOUC(Meta) + ch; *optr++ = (unsigned char) Meta + ch;
} else { } else {
/* characters stay metafied */ /* characters stay metafied */
char *ptr1 = iptr; char *ptr1 = iptr;

12
Src/Zle/complist.c
View File

@ -291,12 +291,12 @@ getcolval(char *s, int multi)
case '?': *p = '\177'; break; case '?': *p = '\177'; break;
default: default:
if (*s >= '0' && *s <= '7') { if (*s >= '0' && *s <= '7') {
int i = STOUC(*s); int i = (unsigned char) *s;
if (*++s >= '0' && *s <= '7') { if (*++s >= '0' && *s <= '7') {
i = (i * 8) + STOUC(*s); i = (i * 8) + (unsigned char) *s;
if (*++s >= '0' && *s <= '7') if (*++s >= '0' && *s <= '7')
i = (i * 8) + STOUC(*s); i = (i * 8) + (unsigned char) *s;
} }
*p = (char) i; *p = (char) i;
} else } else
@ -305,7 +305,7 @@ getcolval(char *s, int multi)
} else if (*s == '^') { } else if (*s == '^') {
if ((s[1] >= '@' && s[1] <= '_') || if ((s[1] >= '@' && s[1] <= '_') ||
(s[1] >= 'a' && s[1] <= 'z')) (s[1] >= 'a' && s[1] <= 'z'))
*p = (char) (STOUC(*s) & ~0x60); *p = (char) ((unsigned char) *s & ~0x60);
else if (s[1] == '?') else if (s[1] == '?')
*p = '\177'; *p = '\177';
else { else {
@ -794,7 +794,7 @@ clnicezputs(int do_colors, char *s, int ml)
*/ */
for (t = sptr; *t; t++) { for (t = sptr; *t; t++) {
/* Input is metafied... */ /* Input is metafied... */
int nc = (*t == Meta) ? STOUC(*++t ^ 32) : STOUC(*t); int nc = (*t == Meta) ? (unsigned char) (*++t ^ 32) : (unsigned char) *t;
/* Is the screen full? */ /* Is the screen full? */
if (ml == mlend - 1 && col == zterm_columns - 1) { if (ml == mlend - 1 && col == zterm_columns - 1) {
mlprinted = ml - oml; mlprinted = ml - oml;
@ -852,7 +852,7 @@ clnicezputs(int do_colors, char *s, int ml)
cc = *s++ ^ 32; cc = *s++ ^ 32;
for (t = nicechar(cc); *t; t++) { for (t = nicechar(cc); *t; t++) {
int nc = (*t == Meta) ? STOUC(*++t ^ 32) : STOUC(*t); int nc = (*t == Meta) ? (unsigned char) (*++t ^ 32) : (unsigned char) *t;
if (ml == mlend - 1 && col == zterm_columns - 1) { if (ml == mlend - 1 && col == zterm_columns - 1) {
mlprinted = ml - oml; mlprinted = ml - oml;
return 0; return 0;

2
Src/Zle/zle.h
View File

@ -526,7 +526,7 @@ typedef REFRESH_ELEMENT *REFRESH_STRING;
((int)((unsigned)(x) - ZSH_INVALID_WCHAR_BASE)) ((int)((unsigned)(x) - ZSH_INVALID_WCHAR_BASE))
/* Turn a single byte character into a private wide character */ /* Turn a single byte character into a private wide character */
#define ZSH_CHAR_TO_INVALID_WCHAR(x) \ #define ZSH_CHAR_TO_INVALID_WCHAR(x) \
((wchar_t)(STOUC(x) + ZSH_INVALID_WCHAR_BASE)) ((wchar_t)((unsigned char) x + ZSH_INVALID_WCHAR_BASE))
#endif #endif

22
Src/Zle/zle_keymap.c
View File

@ -404,7 +404,7 @@ static void
scankeys(HashNode hn, UNUSED(int flags)) scankeys(HashNode hn, UNUSED(int flags))
{ {
Key k = (Key) hn; Key k = (Key) hn;
int f = k->nam[0] == Meta ? STOUC(k->nam[1])^32 : STOUC(k->nam[0]); int f = k->nam[0] == Meta ? (unsigned char) k->nam[1]^32 : (unsigned char) k->nam[0];
char m[3]; char m[3];
while(skm_last < f) { while(skm_last < f) {
@ -566,7 +566,7 @@ mod_export int
bindkey(Keymap km, const char *seq, Thingy bind, char *str) bindkey(Keymap km, const char *seq, Thingy bind, char *str)
{ {
Key k; Key k;
int f = seq[0] == Meta ? STOUC(seq[1])^32 : STOUC(seq[0]); int f = seq[0] == Meta ? (unsigned char) seq[1]^32 : (unsigned char) seq[0];
char *buf, *ptr; char *buf, *ptr;
if(km->flags & KM_IMMUTABLE) if(km->flags & KM_IMMUTABLE)
@ -661,7 +661,7 @@ keybind(Keymap km, char *seq, char **strp)
Key k; Key k;
if(ztrlen(seq) == 1) { if(ztrlen(seq) == 1) {
int f = seq[0] == Meta ? STOUC(seq[1])^32 : STOUC(seq[0]); int f = seq[0] == Meta ? (unsigned char) seq[1]^32 : (unsigned char) seq[0];
Thingy bind = km->first[f]; Thingy bind = km->first[f];
if(bind) if(bind)
@ -687,7 +687,7 @@ keyisprefix(Keymap km, char *seq)
if(!*seq) if(!*seq)
return 1; return 1;
if(ztrlen(seq) == 1) { if(ztrlen(seq) == 1) {
int f = seq[0] == Meta ? STOUC(seq[1])^32 : STOUC(seq[0]); int f = seq[0] == Meta ? (unsigned char) seq[1]^32 : (unsigned char) seq[0];
if(km->first[f]) if(km->first[f])
return 0; return 0;
@ -764,10 +764,10 @@ bin_bindkey(char *name, char **argv, Options ops, UNUSED(int func))
int n; int n;
/* select operation and ensure no clashing arguments */ /* select operation and ensure no clashing arguments */
for(op = opns; op->o && !OPT_ISSET(ops,STOUC(op->o)); op++) ; for(op = opns; op->o && !OPT_ISSET(ops,(unsigned char) op->o); op++) ;
if(op->o) if(op->o)
for(opp = op; (++opp)->o; ) for(opp = op; (++opp)->o; )
if(OPT_ISSET(ops,STOUC(opp->o))) { if(OPT_ISSET(ops,(unsigned char) opp->o)) {
zwarnnam(name, "incompatible operation selection options"); zwarnnam(name, "incompatible operation selection options");
return 1; return 1;
} }
@ -1049,7 +1049,7 @@ bin_bindkey_bind(char *name, char *kmname, Keymap km, char **argv, Options ops,
char m[3]; char m[3];
if(len < 2 || len > 2 + (bseq[1] == '-') || if(len < 2 || len > 2 + (bseq[1] == '-') ||
(first = STOUC(bseq[0])) > (last = STOUC(bseq[len - 1]))) { (first = (unsigned char) bseq[0]) > (last = (unsigned char) bseq[len - 1])) {
zwarnnam(name, "malformed key range `%s'", useq); zwarnnam(name, "malformed key range `%s'", useq);
ret = 1; ret = 1;
} else { } else {
@ -1149,8 +1149,8 @@ scanbindlist(char *seq, Thingy bind, char *str, void *magic)
if(bind == bs->bind && (bind || !strcmp(str, bs->str)) && if(bind == bs->bind && (bind || !strcmp(str, bs->str)) &&
ztrlen(seq) == 1 && ztrlen(bs->lastseq) == 1) { ztrlen(seq) == 1 && ztrlen(bs->lastseq) == 1) {
int l = bs->lastseq[1] ? int l = bs->lastseq[1] ?
STOUC(bs->lastseq[1]) ^ 32 : STOUC(bs->lastseq[0]); (unsigned char) bs->lastseq[1] ^ 32 : (unsigned char) bs->lastseq[0];
int t = seq[1] ? STOUC(seq[1]) ^ 32 : STOUC(seq[0]); int t = seq[1] ? (unsigned char) seq[1] ^ 32 : (unsigned char) seq[0];
if(t == l + 1) { if(t == l + 1) {
zsfree(bs->lastseq); zsfree(bs->lastseq);
@ -1526,10 +1526,10 @@ getrestchar_keybuf(void)
*/ */
while (1) { while (1) {
if (bufind < buflen) { if (bufind < buflen) {
c = STOUC(keybuf[bufind++]); c = (unsigned char) keybuf[bufind++];
if (c == Meta) { if (c == Meta) {
DPUTS(bufind == buflen, "Meta at end of keybuf"); DPUTS(bufind == buflen, "Meta at end of keybuf");
c = STOUC(keybuf[bufind++]) ^ 32; c = (unsigned char) keybuf[bufind++] ^ 32;
} }
} else { } else {
/* /*

4
Src/Zle/zle_main.c
View File

@ -876,7 +876,7 @@ getbyte(long do_keytmout, int *timeout, int full)
#endif #endif
if (kungetct) if (kungetct)
ret = STOUC(kungetbuf[--kungetct]); ret = (unsigned char) kungetbuf[--kungetct];
else { else {
for (;;) { for (;;) {
int q = queue_signal_level(); int q = queue_signal_level();
@ -940,7 +940,7 @@ getbyte(long do_keytmout, int *timeout, int full)
else if (cc == '\n') else if (cc == '\n')
cc = '\r'; cc = '\r';
ret = STOUC(cc); ret = (unsigned char) cc;
} }
/* /*
* curvichg.buf is raw bytes, not wide characters, so is dealt * curvichg.buf is raw bytes, not wide characters, so is dealt

4
Src/Zle/zle_thingy.c
View File

@ -366,10 +366,10 @@ bin_zle(char *name, char **args, Options ops, UNUSED(int func))
int n; int n;
/* select operation and ensure no clashing arguments */ /* select operation and ensure no clashing arguments */
for(op = opns; op->o && !OPT_ISSET(ops,STOUC(op->o)); op++) ; for(op = opns; op->o && !OPT_ISSET(ops, (unsigned char) op->o); op++) ;
if(op->o) if(op->o)
for(opp = op; (++opp)->o; ) for(opp = op; (++opp)->o; )
if(OPT_ISSET(ops,STOUC(opp->o))) { if(OPT_ISSET(ops, (unsigned char) opp->o)) {
zwarnnam(name, "incompatible operation selection options"); zwarnnam(name, "incompatible operation selection options");
return 1; return 1;
} }

4
Src/Zle/zle_utils.c
View File

@ -1265,7 +1265,7 @@ bindztrdup(char *str)
char *buf, *ptr, *ret; char *buf, *ptr, *ret;
for(ptr = str; *ptr; ptr++) { for(ptr = str; *ptr; ptr++) {
c = *ptr == Meta ? STOUC(*++ptr) ^ 32 : STOUC(*ptr); c = *ptr == Meta ? (unsigned char) *++ptr ^ 32 : (unsigned char) *ptr;
if(c & 0x80) { if(c & 0x80) {
len += 3; len += 3;
c &= 0x7f; c &= 0x7f;
@ -1279,7 +1279,7 @@ bindztrdup(char *str)
} }
ptr = buf = zalloc(len); ptr = buf = zalloc(len);
for(; *str; str++) { for(; *str; str++) {
c = *str == Meta ? STOUC(*++str) ^ 32 : STOUC(*str); c = *str == Meta ? (unsigned char) *++str ^ 32 : (unsigned char) *str;
if(c & 0x80) { if(c & 0x80) {
*ptr++ = '\\'; *ptr++ = '\\';
*ptr++ = 'M'; *ptr++ = 'M';

20
Src/builtin.c
View File

@ -2634,7 +2634,7 @@ bin_typeset(char *name, char **argv, LinkList assigns, Options ops, int func)
* these flags are defined in zsh.h */ * these flags are defined in zsh.h */
for (; *optstr; optstr++, bit <<= 1) for (; *optstr; optstr++, bit <<= 1)
{ {
int optval = STOUC(*optstr); int optval = (unsigned char) *optstr;
if (OPT_MINUS(ops,optval)) if (OPT_MINUS(ops,optval))
on |= bit; on |= bit;
else if (OPT_PLUS(ops,optval)) else if (OPT_PLUS(ops,optval))
@ -4752,7 +4752,7 @@ bin_print(char *name, char **args, Options ops, int func)
*/ */
if (*aptr == '\033' || *aptr == '\233') { if (*aptr == '\033' || *aptr == '\233') {
for (aptr++, l--; for (aptr++, l--;
l && !isalpha(STOUC(*aptr)); l && !isalpha((unsigned char) (*aptr));
aptr++, l--) aptr++, l--)
; ;
aptr++; aptr++;
@ -5313,9 +5313,9 @@ bin_print(char *name, char **args, Options ops, int func)
else else
cc = WEOF; cc = WEOF;
if (cc == WEOF) if (cc == WEOF)
cc = (curlen > 1) ? STOUC(curarg[1]) : 0; cc = (curlen > 1) ? (unsigned char) (curarg[1]) : 0;
#else #else
cc = (curlen > 1) ? STOUC(curarg[1]) : 0; cc = (curlen > 1) ? (unsigned char) (curarg[1]) : 0;
#endif #endif
if (type == 2) { if (type == 2) {
doubleval = cc; doubleval = cc;
@ -6685,7 +6685,7 @@ bin_read(char *name, char **args, Options ops, UNUSED(int func))
continue; continue;
first = 0; first = 0;
} }
if (imeta(STOUC(*bptr))) { if (imeta((unsigned char) *bptr)) {
bptr[1] = bptr[0] ^ 32; bptr[1] = bptr[0] ^ 32;
bptr[0] = Meta; bptr[0] = Meta;
bptr += 2; bptr += 2;
@ -6878,7 +6878,7 @@ bin_read(char *name, char **args, Options ops, UNUSED(int func))
if (bslash) if (bslash)
continue; continue;
} }
if (imeta(STOUC(*bptr))) { if (imeta((unsigned char) *bptr)) {
bptr[1] = bptr[0] ^ 32; bptr[1] = bptr[0] ^ 32;
bptr[0] = Meta; bptr[0] = Meta;
bptr += 2; bptr += 2;
@ -7000,14 +7000,14 @@ zread(int izle, int *readchar, long izle_timeout)
buffer. This may be a null byte to indicate EOF. If reading from the buffer. This may be a null byte to indicate EOF. If reading from the
buffer, move on the buffer pointer. */ buffer, move on the buffer pointer. */
if (*zbuf == Meta) if (*zbuf == Meta)
return zbuf++, STOUC(*zbuf++ ^ 32); return zbuf++, (unsigned char) (*zbuf++ ^ 32);
else else
return (*zbuf) ? STOUC(*zbuf++) : EOF; return (*zbuf) ? (unsigned char) *zbuf++ : EOF;
} }
if (*readchar >= 0) { if (*readchar >= 0) {
cc = *readchar; cc = *readchar;
*readchar = -1; *readchar = -1;
return STOUC(cc); return (unsigned char) cc;
} }
for (;;) { for (;;) {
/* read a character from readfd */ /* read a character from readfd */
@ -7015,7 +7015,7 @@ zread(int izle, int *readchar, long izle_timeout)
switch (ret) { switch (ret) {
case 1: case 1:
/* return the character read */ /* return the character read */
return STOUC(cc); return (unsigned char) cc;
case -1: case -1:
#if defined(EAGAIN) || defined(EWOULDBLOCK) #if defined(EAGAIN) || defined(EWOULDBLOCK)
if (!retry && readfd == 0 && ( if (!retry && readfd == 0 && (

2
Src/exec.c
View File

@ -603,7 +603,7 @@ zexecve(char *pth, char **argv, char **newenvp)
isbinary = 1; isbinary = 1;
hasletter = 0; hasletter = 0;
for (ptr = execvebuf; ptr < ptr2; ptr++) { for (ptr = execvebuf; ptr < ptr2; ptr++) {
if (islower(STOUC(*ptr)) || *ptr == '$' || *ptr == '`') if (islower((unsigned char) *ptr) || *ptr == '$' || *ptr == '`')
hasletter = 1; hasletter = 1;
if (hasletter && *ptr == '\n') { if (hasletter && *ptr == '\n') {
isbinary = 0; isbinary = 0;

4
Src/glob.c
View File

@ -2418,11 +2418,11 @@ xpandbraces(LinkList list, LinkNode *np)
memset(ccl, 0, sizeof(ccl) / sizeof(ccl[0])); memset(ccl, 0, sizeof(ccl) / sizeof(ccl[0]));
for (p = str + 1; p < str2;) { for (p = str + 1; p < str2;) {
if (itok(c1 = *p++)) if (itok(c1 = *p++))
c1 = ztokens[c1 - STOUC(Pound)]; c1 = ztokens[c1 - (unsigned char) Pound];
if ((char) c1 == Meta) if ((char) c1 == Meta)
c1 = 32 ^ *p++; c1 = 32 ^ *p++;
if (itok(c2 = *p)) if (itok(c2 = *p))
c2 = ztokens[c2 - STOUC(Pound)]; c2 = ztokens[c2 - (unsigned char) Pound];
if ((char) c2 == Meta) if ((char) c2 == Meta)
c2 = 32 ^ p[1]; c2 = 32 ^ p[1];
if (IS_DASH((char)c1) && lastch >= 0 && if (IS_DASH((char)c1) && lastch >= 0 &&

6
Src/hist.c
View File

@ -2235,7 +2235,7 @@ casemodify(char *str, int how)
char *mbptr; char *mbptr;
for (mbptr = mbstr; mbptr < mbstr + len2; mbptr++) { for (mbptr = mbstr; mbptr < mbstr + len2; mbptr++) {
if (imeta(STOUC(*mbptr))) { if (imeta((unsigned char) *mbptr)) {
*ptr2++ = Meta; *ptr2++ = Meta;
*ptr2++ = *mbptr ^ 32; *ptr2++ = *mbptr ^ 32;
} else } else
@ -2254,10 +2254,10 @@ casemodify(char *str, int how)
int c; int c;
int mod = 0; int mod = 0;
if (*str == Meta) { if (*str == Meta) {
c = STOUC(str[1] ^ 32); c = (unsigned char) (str[1] ^ 32);
str += 2; str += 2;
} else } else
c = STOUC(*str++); c = (unsigned char) *str++;
switch (how) { switch (how) {
case CASMOD_LOWER: case CASMOD_LOWER:
if (isupper(c)) { if (isupper(c)) {

10
Src/init.c
View File

@ -500,10 +500,10 @@ parseopts(char *nam, char ***argvp, char *new_opts, char **cmdp,
} }
} }
break; break;
} else if (isspace(STOUC(**argv))) { } else if (isspace((unsigned char) **argv)) {
/* zsh's typtab not yet set, have to use ctype */ /* zsh's typtab not yet set, have to use ctype */
while (*++*argv) while (*++*argv)
if (!isspace(STOUC(**argv))) { if (!isspace((unsigned char) **argv)) {
badoptionstring: badoptionstring:
WARN_OPTION("bad option string: '%s'", args); WARN_OPTION("bad option string: '%s'", args);
return 1; return 1;
@ -1724,9 +1724,9 @@ zsh_main(UNUSED(int argc), char **argv)
* interactive * interactive
*/ */
typtab['\0'] |= IMETA; typtab['\0'] |= IMETA;
typtab[STOUC(Meta) ] |= IMETA; typtab[(unsigned char) Meta ] |= IMETA;
typtab[STOUC(Marker)] |= IMETA; typtab[(unsigned char) Marker] |= IMETA;
for (t0 = (int)STOUC(Pound); t0 <= (int)STOUC(Nularg); t0++) for (t0 = (int) (unsigned char) Pound; t0 <= (int) (unsigned char) Nularg; t0++)
typtab[t0] |= ITOK | IMETA; typtab[t0] |= ITOK | IMETA;
for (t = argv; *t; *t = metafy(*t, -1, META_ALLOC), t++); for (t = argv; *t; *t = metafy(*t, -1, META_ALLOC), t++);

8
Src/input.c
View File

@ -220,7 +220,7 @@ shingetchar(void)
int nread, rsize = isset(SHINSTDIN) ? 1 : SHINBUFSIZE; int nread, rsize = isset(SHINSTDIN) ? 1 : SHINBUFSIZE;
if (shinbufptr < shinbufendptr) if (shinbufptr < shinbufendptr)
return STOUC(*shinbufptr++); return (unsigned char) *shinbufptr++;
shinbufreset(); shinbufreset();
#ifdef USE_LSEEK #ifdef USE_LSEEK
@ -242,7 +242,7 @@ shingetchar(void)
zerr("lseek(%d, %d): %e", SHIN, -(nread - rsize), errno); zerr("lseek(%d, %d): %e", SHIN, -(nread - rsize), errno);
} else } else
shinbufendptr = shinbuffer + nread; shinbufendptr = shinbuffer + nread;
return STOUC(*shinbufptr++); return (unsigned char) *shinbufptr++;
} }
#endif #endif
for (;;) { for (;;) {
@ -259,7 +259,7 @@ shingetchar(void)
} }
if (shinbufendptr == shinbuffer) if (shinbufendptr == shinbuffer)
return -1; return -1;
return STOUC(*shinbufptr++); return (unsigned char) *shinbufptr++;
} }
/* Read a line from SHIN. Convert tokens and * /* Read a line from SHIN. Convert tokens and *
@ -328,7 +328,7 @@ ingetc(void)
if (inbufleft) { if (inbufleft) {
inbufleft--; inbufleft--;
inbufct--; inbufct--;
if (itok(lastc = STOUC(*inbufptr++))) if (itok(lastc = (unsigned char) *inbufptr++))
continue; continue;
if (((inbufflags & INP_LINENO) || !strin) && lastc == '\n') if (((inbufflags & INP_LINENO) || !strin) && lastc == '\n')
lineno++; lineno++;

10
Src/lex.c
View File

@ -423,7 +423,7 @@ initlextabs(void)
for (t0 = 0; lx2[t0]; t0++) for (t0 = 0; lx2[t0]; t0++)
lexact2[(int)lx2[t0]] = t0; lexact2[(int)lx2[t0]] = t0;
lexact2['&'] = LX2_BREAK; lexact2['&'] = LX2_BREAK;
lexact2[STOUC(Meta)] = LX2_META; lexact2[(unsigned char) Meta] = LX2_META;
lextok2['*'] = Star; lextok2['*'] = Star;
lextok2['?'] = Quest; lextok2['?'] = Quest;
lextok2['{'] = Inbrace; lextok2['{'] = Inbrace;
@ -722,7 +722,7 @@ gettok(void)
} }
return peek; return peek;
} }
switch (lexact1[STOUC(c)]) { switch (lexact1[(unsigned char) c]) {
case LX1_BKSLASH: case LX1_BKSLASH:
d = hgetc(); d = hgetc();
if (d == '\n') if (d == '\n')
@ -960,8 +960,8 @@ gettokstr(int c, int sub)
if (inbl && !in_brace_param && !pct) if (inbl && !in_brace_param && !pct)
act = LX2_BREAK; act = LX2_BREAK;
else { else {
act = lexact2[STOUC(c)]; act = lexact2[(unsigned char) c];
c = lextok2[STOUC(c)]; c = lextok2[(unsigned char) c];
} }
switch (act) { switch (act) {
case LX2_BREAK: case LX2_BREAK:
@ -1263,7 +1263,7 @@ gettokstr(int c, int sub)
continue; continue;
} else { } else {
add(Bnull); add(Bnull);
if (c == STOUC(Meta)) { if (c == (unsigned char) Meta) {
c = hgetc(); c = hgetc();
#ifdef DEBUG #ifdef DEBUG
if (lexstop) { if (lexstop) {

2
Src/math.c
View File

@ -955,7 +955,7 @@ getcvar(char *s)
} }
} }
#endif #endif
mn.u.l = STOUC(*t == Meta ? t[1] ^ 32 : *t); mn.u.l = (unsigned char) (*t == Meta ? t[1] ^ 32 : *t);
} }
unqueue_signals(); unqueue_signals();
return mn; return mn;

2
Src/module.c
View File

@ -2474,7 +2474,7 @@ bin_zmodload(char *nam, char **args, Options ops, UNUSED(int func))
return 1; return 1;
} }
for (fp = fonly; *fp; fp++) { for (fp = fonly; *fp; fp++) {
if (OPT_ISSET(ops,STOUC(*fp)) && !OPT_ISSET(ops,'F')) { if (OPT_ISSET(ops,(unsigned char) *fp) && !OPT_ISSET(ops,'F')) {
zwarnnam(nam, "-%c is only allowed with -F", *fp); zwarnnam(nam, "-%c is only allowed with -F", *fp);
return 1; return 1;
} }

25
Src/params.c
View File

@ -732,7 +732,7 @@ split_env_string(char *env, char **name, char **value)
tenv = strcpy(zhalloc(strlen(env) + 1), env); tenv = strcpy(zhalloc(strlen(env) + 1), env);
for (str = tenv; *str && *str != '='; str++) { for (str = tenv; *str && *str != '='; str++) {
if (STOUC(*str) >= 128) { if ((unsigned char) *str >= 128) {
/* /*
* We'll ignore environment variables with names not * We'll ignore environment variables with names not
* from the portable character set since we don't * from the portable character set since we don't
@ -4123,7 +4123,8 @@ char *
tiedarrgetfn(Param pm) tiedarrgetfn(Param pm)
{ {
struct tieddata *dptr = (struct tieddata *)pm->u.data; struct tieddata *dptr = (struct tieddata *)pm->u.data;
return *dptr->arrptr ? zjoin(*dptr->arrptr, STOUC(dptr->joinchar), 1) : ""; return *dptr->arrptr ?
zjoin(*dptr->arrptr, (unsigned char) dptr->joinchar, 1) : "";
} }
/**/ /**/
@ -4819,12 +4820,12 @@ keyboardhacksetfn(UNUSED(Param pm), char *x)
zwarn("Only one KEYBOARD_HACK character can be defined"); /* could be changed if needed */ zwarn("Only one KEYBOARD_HACK character can be defined"); /* could be changed if needed */
} }
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (!isascii(STOUC(x[i]))) { if (!isascii((unsigned char) x[i])) {
zwarn("KEYBOARD_HACK can only contain ASCII characters"); zwarn("KEYBOARD_HACK can only contain ASCII characters");
return; return;
} }
} }
keyboardhackchar = len ? STOUC(x[0]) : '\0'; keyboardhackchar = len ? (unsigned char) x[0] : '\0';
free(x); free(x);
} else } else
keyboardhackchar = '\0'; keyboardhackchar = '\0';
@ -4858,14 +4859,14 @@ histcharssetfn(UNUSED(Param pm), char *x)
if (len > 3) if (len > 3)
len = 3; len = 3;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (!isascii(STOUC(x[i]))) { if (!isascii((unsigned char) x[i])) {
zwarn("HISTCHARS can only contain ASCII characters"); zwarn("HISTCHARS can only contain ASCII characters");
return; return;
} }
} }
bangchar = len ? STOUC(x[0]) : '\0'; bangchar = len ? (unsigned char) x[0] : '\0';
hatchar = len > 1 ? STOUC(x[1]) : '\0'; hatchar = len > 1 ? (unsigned char) x[1] : '\0';
hashchar = len > 2 ? STOUC(x[2]) : '\0'; hashchar = len > 2 ? (unsigned char) x[2] : '\0';
free(x); free(x);
} else { } else {
bangchar = '!'; bangchar = '!';
@ -5087,7 +5088,7 @@ arrfixenv(char *s, char **t)
if (pm->node.flags & PM_SPECIAL) if (pm->node.flags & PM_SPECIAL)
joinchar = ':'; joinchar = ':';
else else
joinchar = STOUC(((struct tieddata *)pm->u.data)->joinchar); joinchar = (unsigned char) ((struct tieddata *)pm->u.data)->joinchar;
addenv(pm, t ? zjoin(t, joinchar, 1) : ""); addenv(pm, t ? zjoin(t, joinchar, 1) : "");
} }
@ -5109,9 +5110,9 @@ zputenv(char *str)
char *ptr; char *ptr;
int ret; int ret;
for (ptr = str; *ptr && STOUC(*ptr) < 128 && *ptr != '='; ptr++) for (ptr = str; *ptr && (unsigned char) *ptr < 128 && *ptr != '='; ptr++)
; ;
if (STOUC(*ptr) >= 128) { if ((unsigned char) *ptr >= 128) {
/* /*
* Environment variables not in the portable character * Environment variables not in the portable character
* set are non-standard and we don't really know of * set are non-standard and we don't really know of
@ -6022,7 +6023,7 @@ printparamnode(HashNode hn, int printflags)
* append the join char for tied parameters if different from colon * append the join char for tied parameters if different from colon
* for typeset -p output. * for typeset -p output.
*/ */
unsigned char joinchar = STOUC(((struct tieddata *)peer->u.data)->joinchar); unsigned char joinchar = (unsigned char) ((struct tieddata *)peer->u.data)->joinchar;
if (joinchar != ':') { if (joinchar != ':') {
char buf[2]; char buf[2];
buf[0] = joinchar; buf[0] = joinchar;

6
Src/parse.c
View File

@ -433,9 +433,9 @@ ecstrcode(char *s)
t = has_token(s); t = has_token(s);
wordcode c = (t ? 3 : 2); wordcode c = (t ? 3 : 2);
switch (l) { switch (l) {
case 4: c |= ((wordcode) STOUC(s[2])) << 19; case 4: c |= ((wordcode) (unsigned char) s[2]) << 19;
case 3: c |= ((wordcode) STOUC(s[1])) << 11; case 3: c |= ((wordcode) (unsigned char) s[1]) << 11;
case 2: c |= ((wordcode) STOUC(s[0])) << 3; break; case 2: c |= ((wordcode) (unsigned char) s[0]) << 3; break;
case 1: c = (t ? 7 : 6); break; case 1: c = (t ? 7 : 6); break;
} }
return c; return c;

81
Src/pattern.c
View File

@ -239,7 +239,7 @@ typedef unsigned long zrange_t;
* a bit tricky... * a bit tricky...
*/ */
#define WCHAR_INVALID(ch) \ #define WCHAR_INVALID(ch) \
((wchar_t) (0xDC00 + STOUC(ch))) ((wchar_t) (0xDC00 + (unsigned char) ch))
#endif /* MULTIBYTE_SUPPORT */ #endif /* MULTIBYTE_SUPPORT */
/* /*
@ -346,7 +346,7 @@ metacharinc(char **x)
* set doesn't have the property that all bytes with the 8th * set doesn't have the property that all bytes with the 8th
* bit clear are single characters then we are stuffed. * bit clear are single characters then we are stuffed.
*/ */
if (!(patglobflags & GF_MULTIBYTE) || !(STOUC(*inptr) & 0x80)) if (!(patglobflags & GF_MULTIBYTE) || !((unsigned char) *inptr & 0x80))
{ {
if (itok(*inptr)) if (itok(*inptr))
inchar = ztokens[*inptr++ - Pound]; inchar = ztokens[*inptr++ - Pound];
@ -357,7 +357,7 @@ metacharinc(char **x)
inchar = *inptr++; inchar = *inptr++;
} }
*x = inptr; *x = inptr;
return (wchar_t)STOUC(inchar); return (wchar_t)(unsigned char) inchar;
} }
while (*inptr) { while (*inptr) {
@ -1181,8 +1181,8 @@ pattern_range_to_string(char *rangestr, char *outstr)
int len = 0; int len = 0;
while (*rangestr) { while (*rangestr) {
if (imeta(STOUC(*rangestr))) { if (imeta((unsigned char) *rangestr)) {
int swtype = STOUC(*rangestr) - STOUC(Meta); int swtype = (unsigned char) *rangestr - (unsigned char) Meta;
if (swtype == 0) { if (swtype == 0) {
/* Ordindary metafied character */ /* Ordindary metafied character */
@ -1278,17 +1278,17 @@ patcomppiece(int *flagp, int paren)
kshchar = '\0'; kshchar = '\0';
if (*patparse && patparse[1] == Inpar) { if (*patparse && patparse[1] == Inpar) {
if (*patparse == zpc_special[ZPC_KSH_PLUS]) if (*patparse == zpc_special[ZPC_KSH_PLUS])
kshchar = STOUC('+'); kshchar = (unsigned char) '+';
else if (*patparse == zpc_special[ZPC_KSH_BANG]) else if (*patparse == zpc_special[ZPC_KSH_BANG])
kshchar = STOUC('!'); kshchar = (unsigned char) '!';
else if (*patparse == zpc_special[ZPC_KSH_BANG2]) else if (*patparse == zpc_special[ZPC_KSH_BANG2])
kshchar = STOUC('!'); kshchar = (unsigned char) '!';
else if (*patparse == zpc_special[ZPC_KSH_AT]) else if (*patparse == zpc_special[ZPC_KSH_AT])
kshchar = STOUC('@'); kshchar = (unsigned char) '@';
else if (*patparse == zpc_special[ZPC_KSH_STAR]) else if (*patparse == zpc_special[ZPC_KSH_STAR])
kshchar = STOUC('*'); kshchar = (unsigned char) '*';
else if (*patparse == zpc_special[ZPC_KSH_QUEST]) else if (*patparse == zpc_special[ZPC_KSH_QUEST])
kshchar = STOUC('?'); kshchar = (unsigned char) '?';
} }
/* /*
@ -1468,7 +1468,8 @@ patcomppiece(int *flagp, int paren)
ch = range_type(patparse, len); ch = range_type(patparse, len);
patparse = nptr + 2; patparse = nptr + 2;
if (ch != PP_UNKWN) if (ch != PP_UNKWN)
patadd(NULL, STOUC(Meta) + ch, 1, PA_NOALIGN); patadd(NULL, (unsigned char) Meta + ch, 1,
PA_NOALIGN);
continue; continue;
} }
charstart = patparse; charstart = patparse;
@ -1476,10 +1477,10 @@ patcomppiece(int *flagp, int paren)
if (*patparse == Dash && patparse[1] && if (*patparse == Dash && patparse[1] &&
patparse[1] != Outbrack) { patparse[1] != Outbrack) {
patadd(NULL, STOUC(Meta)+PP_RANGE, 1, PA_NOALIGN); patadd(NULL, (unsigned char) Meta+PP_RANGE, 1, PA_NOALIGN);
if (itok(*charstart)) { if (itok(*charstart)) {
patadd(0, STOUC(ztokens[*charstart - Pound]), 1, patadd(0, (unsigned char) ztokens[*charstart - Pound],
PA_NOALIGN); 1, PA_NOALIGN);
} else { } else {
patadd(charstart, 0, patparse-charstart, PA_NOALIGN); patadd(charstart, 0, patparse-charstart, PA_NOALIGN);
} }
@ -1487,7 +1488,7 @@ patcomppiece(int *flagp, int paren)
METACHARINC(patparse); METACHARINC(patparse);
} }
if (itok(*charstart)) { if (itok(*charstart)) {
patadd(0, STOUC(ztokens[*charstart - Pound]), 1, patadd(0, (unsigned char) ztokens[*charstart - Pound], 1,
PA_NOALIGN); PA_NOALIGN);
} else { } else {
patadd(charstart, 0, patparse-charstart, PA_NOALIGN); patadd(charstart, 0, patparse-charstart, PA_NOALIGN);
@ -1910,8 +1911,8 @@ charref(char *x, char *y, int *zmb_ind)
wchar_t wc; wchar_t wc;
size_t ret; size_t ret;
if (!(patglobflags & GF_MULTIBYTE) || !(STOUC(*x) & 0x80)) if (!(patglobflags & GF_MULTIBYTE) || !((unsigned char) *x & 0x80))
return (wchar_t) STOUC(*x); return (wchar_t) (unsigned char) *x;
ret = mbrtowc(&wc, x, y-x, &shiftstate); ret = mbrtowc(&wc, x, y-x, &shiftstate);
@ -1937,7 +1938,7 @@ charnext(char *x, char *y)
wchar_t wc; wchar_t wc;
size_t ret; size_t ret;
if (!(patglobflags & GF_MULTIBYTE) || !(STOUC(*x) & 0x80)) if (!(patglobflags & GF_MULTIBYTE) || !((unsigned char) *x & 0x80))
return x + 1; return x + 1;
ret = mbrtowc(&wc, x, y-x, &shiftstate); ret = mbrtowc(&wc, x, y-x, &shiftstate);
@ -1965,8 +1966,8 @@ charrefinc(char **x, char *y, int *z)
wchar_t wc; wchar_t wc;
size_t ret; size_t ret;
if (!(patglobflags & GF_MULTIBYTE) || !(STOUC(**x) & 0x80)) if (!(patglobflags & GF_MULTIBYTE) || !((unsigned char) **x & 0x80))
return (wchar_t) STOUC(*(*x)++); return (wchar_t) (unsigned char) *(*x)++;
ret = mbrtowc(&wc, *x, y-*x, &shiftstate); ret = mbrtowc(&wc, *x, y-*x, &shiftstate);
@ -2025,13 +2026,13 @@ charsub(char *x, char *y)
#else /* no MULTIBYTE_SUPPORT */ #else /* no MULTIBYTE_SUPPORT */
/* Get a character from the start point in a string */ /* Get a character from the start point in a string */
#define CHARREF(x, y) (STOUC(*(x))) #define CHARREF(x, y) ((unsigned char) (*(x)))
/* Get a pointer to the next character */ /* Get a pointer to the next character */
#define CHARNEXT(x, y) ((x)+1) #define CHARNEXT(x, y) ((x)+1)
/* Increment a pointer past the current character. */ /* Increment a pointer past the current character. */
#define CHARINC(x, y) ((x)++) #define CHARINC(x, y) ((x)++)
/* Get a character and increment */ /* Get a character and increment */
#define CHARREFINC(x, y, z) (STOUC(*(x)++)) #define CHARREFINC(x, y, z) ((unsigned char) (*(x)++))
/* Counter the number of characters between two pointers, smaller first */ /* Counter the number of characters between two pointers, smaller first */
#define CHARSUB(x,y) ((y) - (x)) #define CHARSUB(x,y) ((y) - (x))
@ -2890,7 +2891,7 @@ patmatch(Upat prog)
} }
if (!no && P_OP(next) == P_EXACTLY && if (!no && P_OP(next) == P_EXACTLY &&
(!P_LS_LEN(next) || (!P_LS_LEN(next) ||
!idigit(STOUC(*P_LS_STR(next)))) && !idigit((unsigned char) (*P_LS_STR(next)))) &&
!(patglobflags & 0xff)) !(patglobflags & 0xff))
return 0; return 0;
patinput = --save; patinput = --save;
@ -3600,8 +3601,8 @@ mb_patmatchrange(char *range, wchar_t ch, int zmb_ind, wint_t *indptr, int *mtp)
* ranges specially. * ranges specially.
*/ */
while (*range) { while (*range) {
if (imeta(STOUC(*range))) { if (imeta((unsigned char) *range)) {
int swtype = STOUC(*range++) - STOUC(Meta); int swtype = (unsigned char) *range++ - (unsigned char) Meta;
if (mtp) if (mtp)
*mtp = swtype; *mtp = swtype;
switch (swtype) { switch (swtype) {
@ -3753,8 +3754,8 @@ mb_patmatchindex(char *range, wint_t ind, wint_t *chr, int *mtp)
*mtp = 0; *mtp = 0;
while (*range) { while (*range) {
if (imeta(STOUC(*range))) { if (imeta((unsigned char) *range)) {
int swtype = STOUC(*range++) - STOUC(Meta); int swtype = (unsigned char) *range++ - (unsigned char) Meta;
switch (swtype) { switch (swtype) {
case 0: case 0:
range--; range--;
@ -3845,13 +3846,13 @@ patmatchrange(char *range, int ch, int *indptr, int *mtp)
* ranges specially. * ranges specially.
*/ */
for (; *range; range++) { for (; *range; range++) {
if (imeta(STOUC(*range))) { if (imeta((unsigned char) *range)) {
int swtype = STOUC(*range) - STOUC(Meta); int swtype = (unsigned char) *range - (unsigned char) Meta;
if (mtp) if (mtp)
*mtp = swtype; *mtp = swtype;
switch (swtype) { switch (swtype) {
case 0: case 0:
if (STOUC(*++range ^ 32) == ch) if ((unsigned char) (*++range ^ 32) == ch)
return 1; return 1;
break; break;
case PP_ALPHA: case PP_ALPHA:
@ -3931,9 +3932,9 @@ patmatchrange(char *range, int ch, int *indptr, int *mtp)
break; break;
case PP_RANGE: case PP_RANGE:
range++; range++;
r1 = STOUC(UNMETA(range)); r1 = (unsigned char) UNMETA(range);
METACHARINC(range); METACHARINC(range);
r2 = STOUC(UNMETA(range)); r2 = (unsigned char) UNMETA(range);
if (*range == Meta) if (*range == Meta)
range++; range++;
if (r1 <= ch && ch <= r2) { if (r1 <= ch && ch <= r2) {
@ -3955,7 +3956,7 @@ patmatchrange(char *range, int ch, int *indptr, int *mtp)
DPUTS(1, "BUG: unknown metacharacter in range."); DPUTS(1, "BUG: unknown metacharacter in range.");
break; break;
} }
} else if (STOUC(*range) == ch) { } else if ((unsigned char) *range == ch) {
if (mtp) if (mtp)
*mtp = 0; *mtp = 0;
return 1; return 1;
@ -3989,12 +3990,12 @@ patmatchindex(char *range, int ind, int *chr, int *mtp)
*mtp = 0; *mtp = 0;
for (; *range; range++) { for (; *range; range++) {
if (imeta(STOUC(*range))) { if (imeta((unsigned char) *range)) {
int swtype = STOUC(*range) - STOUC(Meta); int swtype = (unsigned char) *range - (unsigned char) Meta;
switch (swtype) { switch (swtype) {
case 0: case 0:
/* ordinary metafied character */ /* ordinary metafied character */
rchr = STOUC(*++range) ^ 32; rchr = (unsigned char) *++range ^ 32;
if (!ind) { if (!ind) {
*chr = rchr; *chr = rchr;
return 1; return 1;
@ -4028,9 +4029,9 @@ patmatchindex(char *range, int ind, int *chr, int *mtp)
case PP_RANGE: case PP_RANGE:
range++; range++;
r1 = STOUC(UNMETA(range)); r1 = (unsigned char) UNMETA(range);
METACHARINC(range); METACHARINC(range);
r2 = STOUC(UNMETA(range)); r2 = (unsigned char) UNMETA(range);
if (*range == Meta) if (*range == Meta)
range++; range++;
rdiff = r2 - r1; rdiff = r2 - r1;
@ -4050,7 +4051,7 @@ patmatchindex(char *range, int ind, int *chr, int *mtp)
} }
} else { } else {
if (!ind) { if (!ind) {
*chr = STOUC(*range); *chr = (unsigned char) *range;
return 1; return 1;
} }
} }

2
Src/prompt.c
View File

@ -1666,7 +1666,7 @@ match_colour(const char **teststrp, int is_fg, int colour)
tc = TCBGCOLOUR; tc = TCBGCOLOUR;
} }
if (teststrp) { if (teststrp) {
if (**teststrp == '#' && isxdigit(STOUC((*teststrp)[1]))) { if (**teststrp == '#' && isxdigit((unsigned char) (*teststrp)[1])) {
struct color_rgb color; struct color_rgb color;
char *end; char *end;
zlong col = zstrtol(*teststrp+1, &end, 16); zlong col = zstrtol(*teststrp+1, &end, 16);

4
Src/sort.c
View File

@ -138,7 +138,7 @@ eltpcmp(const void *a, const void *b)
int mul = 0; int mul = 0;
for (; *as == *bs && *as; as++, bs++); for (; *as == *bs && *as; as++, bs++);
#ifndef HAVE_STRCOLL #ifndef HAVE_STRCOLL
cmp = (int)STOUC(*as) - (int)STOUC(*bs); cmp = (int) (unsigned char) *as - (int) (unsigned char) *bs;
#endif #endif
if (sortnumeric < 0) { if (sortnumeric < 0) {
if (*as == '-' && idigit(as[1]) && idigit(*bs)) { if (*as == '-' && idigit(as[1]) && idigit(*bs)) {
@ -159,7 +159,7 @@ eltpcmp(const void *a, const void *b)
bs++; bs++;
for (; idigit(*as) && *as == *bs; as++, bs++); for (; idigit(*as) && *as == *bs; as++, bs++);
if (idigit(*as) || idigit(*bs)) { if (idigit(*as) || idigit(*bs)) {
cmp = mul * ((int)STOUC(*as) - (int)STOUC(*bs)); cmp = mul * ((int) (unsigned char) *as - (int) (unsigned char) *bs);
while (idigit(*as) && idigit(*bs)) while (idigit(*as) && idigit(*bs))
as++, bs++; as++, bs++;
if (idigit(*as) && !idigit(*bs)) if (idigit(*as) && !idigit(*bs))

6
Src/subst.c
View File

@ -556,7 +556,7 @@ multsub(char **s, int pf_flags, char ***a, int *isarr, char *sep,
for ( ; *x; x += l) { for ( ; *x; x += l) {
char c = (l = *x == Meta) ? x[1] ^ 32 : *x; char c = (l = *x == Meta) ? x[1] ^ 32 : *x;
l++; l++;
if (!iwsep(STOUC(c))) if (!iwsep((unsigned char) c))
break; break;
*ms_flags |= MULTSUB_WS_AT_START; *ms_flags |= MULTSUB_WS_AT_START;
} }
@ -573,7 +573,7 @@ multsub(char **s, int pf_flags, char ***a, int *isarr, char *sep,
convchar_t c; convchar_t c;
if (*x == Dash) if (*x == Dash)
*x = '-'; *x = '-';
if (itok(STOUC(*x))) { if (itok((unsigned char) *x)) {
/* token, can't be separator, must be single byte */ /* token, can't be separator, must be single byte */
rawc = *x; rawc = *x;
l = 1; l = 1;
@ -582,7 +582,7 @@ multsub(char **s, int pf_flags, char ***a, int *isarr, char *sep,
if (!inq && !inp && WC_ZISTYPE(c, ISEP)) { if (!inq && !inp && WC_ZISTYPE(c, ISEP)) {
*x = '\0'; *x = '\0';
for (x += l; *x; x += l) { for (x += l; *x; x += l) {
if (itok(STOUC(*x))) { if (itok((unsigned char) *x)) {
/* as above */ /* as above */
rawc = *x; rawc = *x;
l = 1; l = 1;

68
Src/utils.c
View File

@ -86,7 +86,7 @@ set_widearray(char *mb_array, Widechar_array wca)
while (*mb_array) { while (*mb_array) {
int mblen; int mblen;
if (STOUC(*mb_array) <= 0x7f) { if ((unsigned char) *mb_array <= 0x7f) {
mb_array++; mb_array++;
*wcptr++ = (wchar_t)*mb_array; *wcptr++ = (wchar_t)*mb_array;
continue; continue;
@ -2920,7 +2920,7 @@ read1char(int echo)
restore_queue_signals(q); restore_queue_signals(q);
if (echo) if (echo)
write_loop(SHTTY, &c, 1); write_loop(SHTTY, &c, 1);
return STOUC(c); return (unsigned char) c;
} }
/**/ /**/
@ -4123,20 +4123,20 @@ inittyptab(void)
#endif #endif
/* typtab['.'] |= IIDENT; */ /* Allow '.' in variable names - broken */ /* typtab['.'] |= IIDENT; */ /* Allow '.' in variable names - broken */
typtab['_'] = IIDENT | IUSER; typtab['_'] = IIDENT | IUSER;
typtab['-'] = typtab['.'] = typtab[STOUC(Dash)] = IUSER; typtab['-'] = typtab['.'] = typtab[(unsigned char) Dash] = IUSER;
typtab[' '] |= IBLANK | INBLANK; typtab[' '] |= IBLANK | INBLANK;
typtab['\t'] |= IBLANK | INBLANK; typtab['\t'] |= IBLANK | INBLANK;
typtab['\n'] |= INBLANK; typtab['\n'] |= INBLANK;
typtab['\0'] |= IMETA; typtab['\0'] |= IMETA;
typtab[STOUC(Meta) ] |= IMETA; typtab[(unsigned char) Meta ] |= IMETA;
typtab[STOUC(Marker)] |= IMETA; typtab[(unsigned char) Marker] |= IMETA;
for (t0 = (int)STOUC(Pound); t0 <= (int)STOUC(LAST_NORMAL_TOK); t0++) for (t0 = (int) (unsigned char) Pound; t0 <= (int) (unsigned char) LAST_NORMAL_TOK; t0++)
typtab[t0] |= ITOK | IMETA; typtab[t0] |= ITOK | IMETA;
for (t0 = (int)STOUC(Snull); t0 <= (int)STOUC(Nularg); t0++) for (t0 = (int) (unsigned char) Snull; t0 <= (int) (unsigned char) Nularg; t0++)
typtab[t0] |= ITOK | IMETA | INULL; typtab[t0] |= ITOK | IMETA | INULL;
for (s = ifs ? ifs : EMULATION(EMULATE_KSH|EMULATE_SH) ? for (s = ifs ? ifs : EMULATION(EMULATE_KSH|EMULATE_SH) ?
DEFAULT_IFS_SH : DEFAULT_IFS; *s; s++) { DEFAULT_IFS_SH : DEFAULT_IFS; *s; s++) {
int c = STOUC(*s == Meta ? *++s ^ 32 : *s); int c = (unsigned char) (*s == Meta ? *++s ^ 32 : *s);
#ifdef MULTIBYTE_SUPPORT #ifdef MULTIBYTE_SUPPORT
if (!isascii(c)) { if (!isascii(c)) {
/* see comment for wordchars below */ /* see comment for wordchars below */
@ -4152,7 +4152,7 @@ inittyptab(void)
typtab[c] |= ISEP; typtab[c] |= ISEP;
} }
for (s = wordchars ? wordchars : DEFAULT_WORDCHARS; *s; s++) { for (s = wordchars ? wordchars : DEFAULT_WORDCHARS; *s; s++) {
int c = STOUC(*s == Meta ? *++s ^ 32 : *s); int c = (unsigned char) (*s == Meta ? *++s ^ 32 : *s);
#ifdef MULTIBYTE_SUPPORT #ifdef MULTIBYTE_SUPPORT
if (!isascii(c)) { if (!isascii(c)) {
/* /*
@ -4173,16 +4173,16 @@ inittyptab(void)
DEFAULT_IFS_SH : DEFAULT_IFS, &ifs_wide); DEFAULT_IFS_SH : DEFAULT_IFS, &ifs_wide);
#endif #endif
for (s = SPECCHARS; *s; s++) for (s = SPECCHARS; *s; s++)
typtab[STOUC(*s)] |= ISPECIAL; typtab[(unsigned char) *s] |= ISPECIAL;
if (typtab_flags & ZTF_SP_COMMA) if (typtab_flags & ZTF_SP_COMMA)
typtab[STOUC(',')] |= ISPECIAL; typtab[(unsigned char) ','] |= ISPECIAL;
if (isset(BANGHIST) && bangchar && (typtab_flags & ZTF_INTERACT)) { if (isset(BANGHIST) && bangchar && (typtab_flags & ZTF_INTERACT)) {
typtab_flags |= ZTF_BANGCHAR; typtab_flags |= ZTF_BANGCHAR;
typtab[bangchar] |= ISPECIAL; typtab[bangchar] |= ISPECIAL;
} else } else
typtab_flags &= ~ZTF_BANGCHAR; typtab_flags &= ~ZTF_BANGCHAR;
for (s = PATCHARS; *s; s++) for (s = PATCHARS; *s; s++)
typtab[STOUC(*s)] |= IPATTERN; typtab[(unsigned char) *s] |= IPATTERN;
unqueue_signals(); unqueue_signals();
} }
@ -4193,10 +4193,10 @@ makecommaspecial(int yesno)
{ {
if (yesno != 0) { if (yesno != 0) {
typtab_flags |= ZTF_SP_COMMA; typtab_flags |= ZTF_SP_COMMA;
typtab[STOUC(',')] |= ISPECIAL; typtab[(unsigned char) ','] |= ISPECIAL;
} else { } else {
typtab_flags &= ~ZTF_SP_COMMA; typtab_flags &= ~ZTF_SP_COMMA;
typtab[STOUC(',')] &= ~ISPECIAL; typtab[(unsigned char) ','] &= ~ISPECIAL;
} }
} }
@ -4336,7 +4336,7 @@ itype_end(const char *ptr, int itype, int once)
if (wc == WEOF) { if (wc == WEOF) {
/* invalid, treat as single character */ /* invalid, treat as single character */
int chr = STOUC(*ptr == Meta ? ptr[1] ^ 32 : *ptr); int chr = (unsigned char) (*ptr == Meta ? ptr[1] ^ 32 : *ptr);
/* in this case non-ASCII characters can't match */ /* in this case non-ASCII characters can't match */
if (chr > 127 || !zistype(chr,itype)) if (chr > 127 || !zistype(chr,itype))
break; break;
@ -4375,7 +4375,7 @@ itype_end(const char *ptr, int itype, int once)
} else } else
#endif #endif
for (;;) { for (;;) {
int chr = STOUC(*ptr == Meta ? ptr[1] ^ 32 : *ptr); int chr = (unsigned char) (*ptr == Meta ? ptr[1] ^ 32 : *ptr);
if (!zistype(chr,itype)) if (!zistype(chr,itype))
break; break;
ptr += (*ptr == Meta) ? 2 : 1; ptr += (*ptr == Meta) ? 2 : 1;
@ -4983,11 +4983,11 @@ unmeta_one(const char *in, int *sz)
*sz = mb_metacharlenconv_r(in, &wc, &wstate); *sz = mb_metacharlenconv_r(in, &wc, &wstate);
#else #else
if (in[0] == Meta) { if (in[0] == Meta) {
*sz = 2; *sz = 2;
wc = STOUC(in[1] ^ 32); wc = (unsigned char) (in[1] ^ 32);
} else { } else {
*sz = 1; *sz = 1;
wc = STOUC(in[0]); wc = (unsigned char) in[0];
} }
#endif #endif
return wc; return wc;
@ -5022,11 +5022,11 @@ ztrcmp(char const *s1, char const *s2)
if(!(c1 = *s1)) if(!(c1 = *s1))
c1 = -1; c1 = -1;
else if(c1 == STOUC(Meta)) else if(c1 == (unsigned char) Meta)
c1 = *++s1 ^ 32; c1 = *++s1 ^ 32;
if(!(c2 = *s2)) if(!(c2 = *s2))
c2 = -1; c2 = -1;
else if(c2 == STOUC(Meta)) else if(c2 == (unsigned char) Meta)
c2 = *++s2 ^ 32; c2 = *++s2 ^ 32;
if(c1 == c2) if(c1 == c2)
@ -5458,7 +5458,7 @@ mb_metacharlenconv_r(const char *s, wint_t *wcp, mbstate_t *mbsp)
const char *ptr; const char *ptr;
wchar_t wc; wchar_t wc;
if (STOUC(*s) <= 0x7f) { if ((unsigned char) *s <= 0x7f) {
if (wcp) if (wcp)
*wcp = (wint_t)*s; *wcp = (wint_t)*s;
return 1; return 1;
@ -5516,10 +5516,10 @@ mb_metacharlenconv_r(const char *s, wint_t *wcp, mbstate_t *mbsp)
mod_export int mod_export int
mb_metacharlenconv(const char *s, wint_t *wcp) mb_metacharlenconv(const char *s, wint_t *wcp)
{ {
if (!isset(MULTIBYTE) || STOUC(*s) <= 0x7f) { if (!isset(MULTIBYTE) || (unsigned char) *s <= 0x7f) {
/* treat as single byte, possibly metafied */ /* treat as single byte, possibly metafied */
if (wcp) if (wcp)
*wcp = (wint_t)STOUC(*s == Meta ? s[1] ^ 32 : *s); *wcp = (wint_t)(unsigned char) (*s == Meta ? s[1] ^ 32 : *s);
return 1 + (*s == Meta); return 1 + (*s == Meta);
} }
/* /*
@ -5581,7 +5581,7 @@ mb_metastrlenend(char *ptr, int width, char *eptr)
inchar = *ptr; inchar = *ptr;
ptr++; ptr++;
if (complete && STOUC(inchar) <= STOUC(0x7f)) { if (complete && (unsigned char) inchar <= (unsigned char) 0x7f) {
/* /*
* We rely on 7-bit US-ASCII as a subset, so skip * We rely on 7-bit US-ASCII as a subset, so skip
* multibyte handling if we have such a character. * multibyte handling if we have such a character.
@ -5657,7 +5657,7 @@ mb_charlenconv_r(const char *s, int slen, wint_t *wcp, mbstate_t *mbsp)
const char *ptr; const char *ptr;
wchar_t wc; wchar_t wc;
if (slen && STOUC(*s) <= 0x7f) { if (slen && (unsigned char) *s <= 0x7f) {
if (wcp) if (wcp)
*wcp = (wint_t)*s; *wcp = (wint_t)*s;
return 1; return 1;
@ -5698,7 +5698,7 @@ mb_charlenconv_r(const char *s, int slen, wint_t *wcp, mbstate_t *mbsp)
mod_export int mod_export int
mb_charlenconv(const char *s, int slen, wint_t *wcp) mb_charlenconv(const char *s, int slen, wint_t *wcp)
{ {
if (!isset(MULTIBYTE) || STOUC(*s) <= 0x7f) { if (!isset(MULTIBYTE) || (unsigned char) *s <= 0x7f) {
if (wcp) if (wcp)
*wcp = (wint_t)*s; *wcp = (wint_t)*s;
return 1; return 1;
@ -5717,7 +5717,7 @@ mod_export int
metacharlenconv(const char *x, int *c) metacharlenconv(const char *x, int *c)
{ {
/* /*
* Here we don't use STOUC() on the chars since they * Here we don't use an (unsigned char) cast on the chars since they
* may be compared against other chars and this will fail * may be compared against other chars and this will fail
* if chars are signed and the high bit is set. * if chars are signed and the high bit is set.
*/ */
@ -5779,7 +5779,7 @@ sb_niceformat(const char *s, FILE *stream, char **outstrp, int flags)
eptr = ptr + umlen; eptr = ptr + umlen;
while (ptr < eptr) { while (ptr < eptr) {
int c = STOUC(*ptr); int c = (unsigned char) *ptr;
if (c == '\'' && (flags & NICEFLAG_QUOTE)) { if (c == '\'' && (flags & NICEFLAG_QUOTE)) {
fmt = "\\'"; fmt = "\\'";
newl = 2; newl = 2;
@ -5996,9 +5996,9 @@ addunprintable(char *v, const char *u, const char *uend)
*/ */
int c; int c;
if (*u == Meta) if (*u == Meta)
c = STOUC(*++u ^ 32); c = (unsigned char) (*++u ^ 32);
else else
c = STOUC(*u); c = (unsigned char) *u;
switch (c) { switch (c) {
case '\0': case '\0':
*v++ = '\\'; *v++ = '\\';
@ -7104,7 +7104,7 @@ getkeystring(char *s, int *len, int how, int *misc)
continue; continue;
#ifdef MULTIBYTE_SUPPORT #ifdef MULTIBYTE_SUPPORT
} else if ((how & GETKEY_SINGLE_CHAR) && } else if ((how & GETKEY_SINGLE_CHAR) &&
isset(MULTIBYTE) && STOUC(*s) > 127) { isset(MULTIBYTE) && (unsigned char) *s > 127) {
wint_t wc; wint_t wc;
int len; int len;
len = mb_metacharlenconv(s, &wc); len = mb_metacharlenconv(s, &wc);
@ -7207,7 +7207,7 @@ getkeystring(char *s, int *len, int how, int *misc)
t = tbuf; t = tbuf;
} }
if ((how & GETKEY_SINGLE_CHAR) && t != tmp) { if ((how & GETKEY_SINGLE_CHAR) && t != tmp) {
*misc = STOUC(tmp[0]); *misc = (unsigned char) tmp[0];
return s + 1; return s + 1;
} }
} }

13
Src/zsh.h
View File

@ -135,19 +135,6 @@ struct mathfunc {
#define STRMATHFUNC(name, func, id) \ #define STRMATHFUNC(name, func, id) \
{ NULL, name, MFF_STR, NULL, func, NULL, 0, 0, id } { NULL, name, MFF_STR, NULL, func, NULL, 0, 0, id }
/* Character tokens are sometimes casted to (unsigned char)'s. *
* Unfortunately, some compilers don't correctly cast signed to *
* unsigned promotions; i.e. (int)(unsigned char)((char) -1) evaluates *
* to -1, instead of 255 like it should. We circumvent the troubles *
* of such shameful delinquency by casting to a larger unsigned type *
* then back down to unsigned char. */
#ifdef BROKEN_SIGNED_TO_UNSIGNED_CASTING
# define STOUC(X) ((unsigned char)(unsigned short)(X))
#else
# define STOUC(X) ((unsigned char)(X))
#endif
/* Meta together with the character following Meta denotes the character * /* Meta together with the character following Meta denotes the character *
* which is the exclusive or of 32 and the character following Meta. * * which is the exclusive or of 32 and the character following Meta. *
* This is used to represent characters which otherwise has special * * This is used to represent characters which otherwise has special *

2
Src/ztype.h
View File

@ -43,7 +43,7 @@
#define IWSEP (1 << 13) #define IWSEP (1 << 13)
#define INULL (1 << 14) #define INULL (1 << 14)
#define IPATTERN (1 << 15) #define IPATTERN (1 << 15)
#define zistype(X,Y) (typtab[STOUC(X)] & Y) #define zistype(X,Y) (typtab[(unsigned char) (X)] & Y)
#define idigit(X) zistype(X,IDIGIT) #define idigit(X) zistype(X,IDIGIT)
#define ialnum(X) zistype(X,IALNUM) #define ialnum(X) zistype(X,IALNUM)
#define iblank(X) zistype(X,IBLANK) /* blank, not including \n */ #define iblank(X) zistype(X,IBLANK) /* blank, not including \n */

10
configure.ac
View File

@ -582,16 +582,6 @@ if test x$zsh_cv_c_have_union_init = xyes; then
AC_DEFINE(HAVE_UNION_INIT) AC_DEFINE(HAVE_UNION_INIT)
fi fi
dnl Checking if compiler correctly cast signed to unsigned.
AC_CACHE_CHECK(if signed to unsigned casting is broken,
zsh_cv_c_broken_signed_to_unsigned_casting,
[AC_RUN_IFELSE([AC_LANG_SOURCE([[int main(){return((int)(unsigned char)((char) -1) == 255);}]])],[zsh_cv_c_broken_signed_to_unsigned_casting=yes],[zsh_cv_c_broken_signed_to_unsigned_casting=no],[zsh_cv_c_broken_signed_to_unsigned_casting=no])])
AH_TEMPLATE([BROKEN_SIGNED_TO_UNSIGNED_CASTING],
[Define to 1 if compiler incorrectly cast signed to unsigned.])
if test x$zsh_cv_c_broken_signed_to_unsigned_casting = xyes; then
AC_DEFINE(BROKEN_SIGNED_TO_UNSIGNED_CASTING)
fi
dnl Checking if the compiler supports variable-length arrays dnl Checking if the compiler supports variable-length arrays
AC_CACHE_CHECK(if the compiler supports variable-length arrays, AC_CACHE_CHECK(if the compiler supports variable-length arrays,
zsh_cv_c_variable_length_arrays, zsh_cv_c_variable_length_arrays,