PlaneteCasio/libc
1
0
Fork 0
Code Issues 6 Pull requests Releases Wiki Activity

* libc/minires.c (scanline): Accommodate ctype changes which disallow use of an

Browse source 
unadorned char argument to is* macros.
* regex/regcomp.c: Ditto, throughout.
* regex/regex2.h (ISWORD): Ditto.
This commit is contained in:
Christopher Faylor 2009-05-04 04:30:37 +00:00
parent b65ec404a7
commit b7a1552440
4 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View file

@ -1,3 +1,10 @@
2009-05-04 Christopher Faylor <me+cygwin@cgf.cx>
* libc/minires.c (scanline): Accommodate ctype changes which disallow
use of an unadorned char argument to is* macros.
* regex/regcomp.c: Ditto, throughout.
* regex/regex2.h (ISWORD): Ditto.
2009-05-03 Christopher Faylor <me+cygwin@cgf.cx>
* fhandler.h (fhandler_console::MAX_WRITE_CHARS): Declare.

4
winsup/cygwin/libc/minires.c
View file

@ -43,11 +43,11 @@ static int scanline(char * in, char **list, int * sizes, int maxnum)
int i;
char * startp;
for (i = 0; i < maxnum; i++) {
while((*in) && (isspace(*in) || *in == ',')) in++;
while((*in) && (isspace((unsigned)*in) || *in == ',')) in++;
if (*in == 0)
break;
startp = in++;
while((*in) && !isspace(*in) && *in != ',') in++;
while((*in) && !isspace((unsigned)*in) && *in != ',') in++;
list[i] = startp;
sizes[i] = in - startp + 1;
if (*in)

14
winsup/cygwin/regex/regcomp.c
View file

@ -311,7 +311,7 @@ register struct parse *p;
ordinary(p, c);
break;
case '{': /* okay as ordinary except if digit follows */
REQUIRE(!MORE() || !isdigit(PEEK()), REG_BADRPT);
REQUIRE(!MORE() || !isdigit((unsigned)PEEK()), REG_BADRPT);
/* FALLTHROUGH */
default:
ordinary(p, c);
@ -323,7 +323,7 @@ register struct parse *p;
c = PEEK();
/* we call { a repetition if followed by a digit */
if (!( c == '*' || c == '+' || c == '?' ||
(c == '{' && MORE2() && isdigit(PEEK2())) ))
(c == '{' && MORE2() && isdigit((unsigned)PEEK2())) ))
return; /* no repetition, we're done */
NEXT();
@ -352,7 +352,7 @@ register struct parse *p;
case '{':
count = p_count(p);
if (EAT(',')) {
if (isdigit(PEEK())) {
if (isdigit((unsigned)PEEK())) {
count2 = p_count(p);
REQUIRE(count <= count2, REG_BADBR);
} else /* single number with comma */
@ -373,7 +373,7 @@ register struct parse *p;
return;
c = PEEK();
if (!( c == '*' || c == '+' || c == '?' ||
(c == '{' && MORE2() && isdigit(PEEK2())) ) )
(c == '{' && MORE2() && isdigit((unsigned)PEEK2())) ) )
return;
SETERROR(REG_BADRPT);
}
@ -530,7 +530,7 @@ int starordinary; /* is a leading * an ordinary character? */
} else if (EATTWO('\\', '{')) {
count = p_count(p);
if (EAT(',')) {
if (MORE() && isdigit(PEEK())) {
if (MORE() && isdigit((unsigned)PEEK())) {
count2 = p_count(p);
REQUIRE(count <= count2, REG_BADBR);
} else /* single number with comma */
@ -561,7 +561,7 @@ register struct parse *p;
register int count = 0;
register int ndigits = 0;
while (MORE() && isdigit(PEEK()) && count <= DUPMAX) {
while (MORE() && isdigit((unsigned)PEEK()) && count <= DUPMAX) {
count = count*10 + (GETNEXT() - '0');
ndigits++;
}
@ -728,7 +728,7 @@ register cset *cs;
register const char *u;
register char c;
while (MORE() && isalpha(PEEK()))
while (MORE() && isalpha((unsigned)PEEK()))
NEXT();
len = p->next - sp;
for (cp = cclasses; cp->name != NULL; cp++)

2
winsup/cygwin/regex/regex2.h
View file

@ -131,4 +131,4 @@ struct re_guts {
/* misc utilities */
#define OUT (CHAR_MAX+1) /* a non-character value */
#define ISWORD(c) (isalnum(c) || (c) == '_')
#define ISWORD(c) (isalnum((unsigned)c) || (c) == '_')