rainlance/amiga-tz
1
0
Fork 0
mirror of https://frontier.innolan.net/rainlance/amiga-tz.git synced 2026-10-05 00:01:55 +00:00
Code Releases Activity

isascii et al fixes

Browse Source 
SCCS-file: zic.c
SCCS-SID: 7.125
This commit is contained in:
Arthur David Olson
2012-07-18 03:02:50 -04:00
committed by Paul Eggert
parent c2430b1665
commit 18d321d9fd
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zic.c
+11 -7
View File
@@ -2046,8 +2046,9 @@ register char * cp;
emalloc((int) ((strlen(cp) + 1) * sizeof *array)); emalloc((int) ((strlen(cp) + 1) * sizeof *array));
nsubs = 0; nsubs = 0;
for ( ; ; ) { for ( ; ; ) {
while (isascii(*cp) && isspace((unsigned char) *cp)) while (isascii((unsigned char) *cp) &&
++cp; isspace((unsigned char) *cp))
++cp;
if (*cp == '\0' || *cp == '#') if (*cp == '\0' || *cp == '#')
break; break;
array[nsubs++] = dp = cp; array[nsubs++] = dp = cp;
@@ -2210,8 +2211,9 @@ const char * const string;
*/ */
cp = string; cp = string;
wp = NULL; wp = NULL;
while (isascii(*cp) && isalpha(*cp)) while (isascii((unsigned char) *cp) &&
++cp; isalpha((unsigned char) *cp))
++cp;
if (cp - string == 0) if (cp - string == 0)
wp = _("time zone abbreviation lacks alphabetic at start"); wp = _("time zone abbreviation lacks alphabetic at start");
if (noise && cp - string > 3) if (noise && cp - string > 3)
@@ -2220,9 +2222,11 @@ wp = _("time zone abbreviation has more than 3 alphabetics");
wp = _("time zone abbreviation has too many alphabetics"); wp = _("time zone abbreviation has too many alphabetics");
if (wp == NULL && (*cp == '+' || *cp == '-')) { if (wp == NULL && (*cp == '+' || *cp == '-')) {
++cp; ++cp;
if (isascii(*cp) && isdigit(*cp)) if (isascii((unsigned char) *cp) &&
if (*cp++ == '1' && *cp >= '0' && *cp <= '4') isdigit((unsigned char) *cp))
++cp; if (*cp++ == '1' &&
*cp >= '0' && *cp <= '4')
++cp;
} }
if (*cp != '\0') if (*cp != '\0')
wp = _("time zone abbreviation differs from POSIX standard"); wp = _("time zone abbreviation differs from POSIX standard");