* safe-ctype.c: New file.
* Makefile.in (CFILES): Add safe-ctype.c. (REQUIRED_OFILES): Add safe-ctype.o. * argv.c: Define ISBLANK and use it, not isspace. * basename.c, cplus-dem.c, fnmatch.c, pexecute.c, strtod.c, strtol.c, strtoul.c: Include safe-ctype.h, not ctype.h. Use uppercase ctype macros. Don't test ISUPPER(c)/ISLOWER(c) before calling TOLOWER(c)/TOUPPER(c).
This commit is contained in:
DJ Delorie
parent
39cd252546
commit
ac424eb32c
11 changed files with 243 additions and 77 deletions
|
|
@ -1,3 +1,15 @@
|
|||
2000-12-07 Zack Weinberg <zack@wolery.stanford.edu>
|
||||
|
||||
* safe-ctype.c: New file.
|
||||
* Makefile.in (CFILES): Add safe-ctype.c.
|
||||
(REQUIRED_OFILES): Add safe-ctype.o.
|
||||
|
||||
* argv.c: Define ISBLANK and use it, not isspace.
|
||||
* basename.c, cplus-dem.c, fnmatch.c, pexecute.c, strtod.c,
|
||||
strtol.c, strtoul.c: Include safe-ctype.h, not ctype.h. Use
|
||||
uppercase ctype macros. Don't test ISUPPER(c)/ISLOWER(c)
|
||||
before calling TOLOWER(c)/TOUPPER(c).
|
||||
|
||||
2000-12-07 Mike Stump <mrs@wrs.com>
|
||||
|
||||
* Makefile.in (distclean): When cleaning, remove testsuite.
|
||||
|
|
|
|||
|
|
@ -128,22 +128,22 @@ CFILES = asprintf.c alloca.c argv.c atexit.c basename.c bcmp.c bcopy.c \
|
|||
bzero.c calloc.c choose-temp.c clock.c concat.c cplus-dem.c \
|
||||
cp-demangle.c dyn-string.c fdmatch.c fnmatch.c getcwd.c \
|
||||
getpwd.c getopt.c getopt1.c getpagesize.c getruntime.c \
|
||||
floatformat.c hashtab.c hex.c index.c insque.c md5.c memchr.c memcmp.c\
|
||||
memcpy.c memmove.c memset.c mkstemps.c objalloc.c obstack.c \
|
||||
floatformat.c hashtab.c hex.c index.c insque.c md5.c memchr.c \
|
||||
memcmp.c memcpy.c memmove.c memset.c mkstemps.c objalloc.c obstack.c \
|
||||
partition.c pexecute.c putenv.c random.c rename.c rindex.c setenv.c \
|
||||
sigsetmask.c sort.c spaces.c splay-tree.c strcasecmp.c strncasecmp.c \
|
||||
strchr.c strdup.c strerror.c strncmp.c strrchr.c strsignal.c strstr.c \
|
||||
strtod.c strtol.c strtoul.c tmpnam.c vasprintf.c vfork.c vfprintf.c \
|
||||
vprintf.c vsprintf.c waitpid.c xatexit.c xexit.c xmalloc.c \
|
||||
xmemdup.c xstrdup.c xstrerror.c
|
||||
sigsetmask.c safe-ctype.c sort.c spaces.c splay-tree.c strcasecmp.c \
|
||||
strncasecmp.c strchr.c strdup.c strerror.c strncmp.c strrchr.c \
|
||||
strsignal.c strstr.c strtod.c strtol.c strtoul.c tmpnam.c vasprintf.c \
|
||||
vfork.c vfprintf.c vprintf.c vsprintf.c waitpid.c xatexit.c xexit.c \
|
||||
xmalloc.c xmemdup.c xstrdup.c xstrerror.c
|
||||
|
||||
# These are always included in the library.
|
||||
REQUIRED_OFILES = argv.o choose-temp.o concat.o cplus-dem.o cp-demangle.o \
|
||||
dyn-string.o fdmatch.o fnmatch.o getopt.o getopt1.o getpwd.o \
|
||||
REQUIRED_OFILES = argv.o choose-temp.o concat.o cplus-dem.o cp-demangle.o \
|
||||
dyn-string.o fdmatch.o fnmatch.o getopt.o getopt1.o getpwd.o \
|
||||
getruntime.o hashtab.o hex.o floatformat.o md5.o objalloc.o obstack.o \
|
||||
partition.o pexecute.o sort.o spaces.o splay-tree.o strerror.o \
|
||||
strsignal.o xatexit.o xexit.o xmalloc.o xmemdup.o xstrdup.o \
|
||||
xstrerror.o
|
||||
partition.o pexecute.o safe-ctype.o sort.o spaces.o splay-tree.o \
|
||||
strerror.o strsignal.o xatexit.o xexit.o xmalloc.o xmemdup.o \
|
||||
xstrdup.o xstrerror.o
|
||||
|
||||
$(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(ALLOCA)
|
||||
rm -f $(TARGETLIB)
|
||||
|
|
|
|||
|
|
@ -25,10 +25,7 @@ Boston, MA 02111-1307, USA. */
|
|||
#include "ansidecl.h"
|
||||
#include "libiberty.h"
|
||||
|
||||
#ifdef isspace
|
||||
#undef isspace
|
||||
#endif
|
||||
#define isspace(ch) ((ch) == ' ' || (ch) == '\t')
|
||||
#define ISBLANK(ch) ((ch) == ' ' || (ch) == '\t')
|
||||
|
||||
/* Routines imported from standard C runtime libraries. */
|
||||
|
||||
|
|
@ -227,7 +224,7 @@ char *input;
|
|||
do
|
||||
{
|
||||
/* Pick off argv[argc] */
|
||||
while (isspace (*input))
|
||||
while (ISBLANK (*input))
|
||||
{
|
||||
input++;
|
||||
}
|
||||
|
|
@ -260,7 +257,7 @@ char *input;
|
|||
arg = copybuf;
|
||||
while (*input != EOS)
|
||||
{
|
||||
if (isspace (*input) && !squote && !dquote && !bsquote)
|
||||
if (ISBLANK (*input) && !squote && !dquote && !bsquote)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
|
@ -326,7 +323,7 @@ char *input;
|
|||
argc++;
|
||||
argv[argc] = NULL;
|
||||
|
||||
while (isspace (*input))
|
||||
while (ISBLANK (*input))
|
||||
{
|
||||
input++;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ BUGS
|
|||
|
||||
#include "ansidecl.h"
|
||||
#include "libiberty.h"
|
||||
#include <ctype.h>
|
||||
#include "safe-ctype.h"
|
||||
|
||||
#ifndef DIR_SEPARATOR
|
||||
#define DIR_SEPARATOR '/'
|
||||
|
|
@ -50,7 +50,7 @@ basename (name)
|
|||
|
||||
#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
|
||||
/* Skip over the disk name in MSDOS pathnames. */
|
||||
if (isalpha (name[0]) && name[1] == ':')
|
||||
if (ISALPHA (name[0]) && name[1] == ':')
|
||||
name += 2;
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,8 @@ Boston, MA 02111-1307, USA. */
|
|||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <ctype.h>
|
||||
#include "safe-ctype.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
|
|
@ -544,10 +545,10 @@ consume_count (type)
|
|||
{
|
||||
int count = 0;
|
||||
|
||||
if (! isdigit ((unsigned char)**type))
|
||||
if (! ISDIGIT ((unsigned char)**type))
|
||||
return -1;
|
||||
|
||||
while (isdigit ((unsigned char)**type))
|
||||
while (ISDIGIT ((unsigned char)**type))
|
||||
{
|
||||
count *= 10;
|
||||
|
||||
|
|
@ -558,7 +559,7 @@ consume_count (type)
|
|||
ten. */
|
||||
if ((count % 10) != 0)
|
||||
{
|
||||
while (isdigit ((unsigned char) **type))
|
||||
while (ISDIGIT ((unsigned char) **type))
|
||||
(*type)++;
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -584,7 +585,7 @@ consume_count_with_underscores (mangled)
|
|||
if (**mangled == '_')
|
||||
{
|
||||
(*mangled)++;
|
||||
if (!isdigit ((unsigned char)**mangled))
|
||||
if (!ISDIGIT ((unsigned char)**mangled))
|
||||
return -1;
|
||||
|
||||
idx = consume_count (mangled);
|
||||
|
|
@ -716,8 +717,8 @@ cplus_demangle_opname (opname, result, options)
|
|||
}
|
||||
}
|
||||
else if (opname[0] == '_' && opname[1] == '_'
|
||||
&& islower((unsigned char)opname[2])
|
||||
&& islower((unsigned char)opname[3]))
|
||||
&& ISLOWER((unsigned char)opname[2])
|
||||
&& ISLOWER((unsigned char)opname[3]))
|
||||
{
|
||||
if (opname[4] == '\0')
|
||||
{
|
||||
|
|
@ -1003,8 +1004,8 @@ ada_demangle (mangled, option)
|
|||
sizeof (char));
|
||||
demangled = demangling_buffer;
|
||||
|
||||
if (isdigit ((unsigned char) mangled[len0 - 1])) {
|
||||
for (i = len0 - 2; i >= 0 && isdigit ((unsigned char) mangled[i]); i -= 1)
|
||||
if (ISDIGIT ((unsigned char) mangled[len0 - 1])) {
|
||||
for (i = len0 - 2; i >= 0 && ISDIGIT ((unsigned char) mangled[i]); i -= 1)
|
||||
;
|
||||
if (i > 1 && mangled[i] == '_' && mangled[i - 1] == '_')
|
||||
{
|
||||
|
|
@ -1018,7 +1019,7 @@ ada_demangle (mangled, option)
|
|||
}
|
||||
}
|
||||
|
||||
for (i = 0, j = 0; i < len0 && ! isalpha ((unsigned char)mangled[i]);
|
||||
for (i = 0, j = 0; i < len0 && ! ISALPHA ((unsigned char)mangled[i]);
|
||||
i += 1, j += 1)
|
||||
demangled[j] = mangled[i];
|
||||
|
||||
|
|
@ -1042,7 +1043,7 @@ ada_demangle (mangled, option)
|
|||
demangled[j] = '\000';
|
||||
|
||||
for (i = 0; demangled[i] != '\0'; i += 1)
|
||||
if (isupper ((unsigned char)demangled[i]) || demangled[i] == ' ')
|
||||
if (ISUPPER ((unsigned char)demangled[i]) || demangled[i] == ' ')
|
||||
goto Suppress;
|
||||
|
||||
if (! changed)
|
||||
|
|
@ -1532,7 +1533,7 @@ demangle_signature (work, mangled, declp)
|
|||
if (HP_DEMANGLING)
|
||||
{
|
||||
(*mangled)++;
|
||||
while (**mangled && isdigit ((unsigned char)**mangled))
|
||||
while (**mangled && ISDIGIT ((unsigned char)**mangled))
|
||||
(*mangled)++;
|
||||
}
|
||||
else
|
||||
|
|
@ -1865,7 +1866,7 @@ demangle_real_value (work, mangled, s)
|
|||
string_appendn (s, "-", 1);
|
||||
(*mangled)++;
|
||||
}
|
||||
while (isdigit ((unsigned char)**mangled))
|
||||
while (ISDIGIT ((unsigned char)**mangled))
|
||||
{
|
||||
string_appendn (s, *mangled, 1);
|
||||
(*mangled)++;
|
||||
|
|
@ -1874,7 +1875,7 @@ demangle_real_value (work, mangled, s)
|
|||
{
|
||||
string_appendn (s, ".", 1);
|
||||
(*mangled)++;
|
||||
while (isdigit ((unsigned char)**mangled))
|
||||
while (ISDIGIT ((unsigned char)**mangled))
|
||||
{
|
||||
string_appendn (s, *mangled, 1);
|
||||
(*mangled)++;
|
||||
|
|
@ -1884,7 +1885,7 @@ demangle_real_value (work, mangled, s)
|
|||
{
|
||||
string_appendn (s, "e", 1);
|
||||
(*mangled)++;
|
||||
while (isdigit ((unsigned char)**mangled))
|
||||
while (ISDIGIT ((unsigned char)**mangled))
|
||||
{
|
||||
string_appendn (s, *mangled, 1);
|
||||
(*mangled)++;
|
||||
|
|
@ -2735,20 +2736,20 @@ demangle_prefix (work, mangled, declp)
|
|||
}
|
||||
else if (work -> static_type)
|
||||
{
|
||||
if (!isdigit ((unsigned char)scan[0]) && (scan[0] != 't'))
|
||||
if (!ISDIGIT ((unsigned char)scan[0]) && (scan[0] != 't'))
|
||||
{
|
||||
success = 0;
|
||||
}
|
||||
}
|
||||
else if ((scan == *mangled)
|
||||
&& (isdigit ((unsigned char)scan[2]) || (scan[2] == 'Q')
|
||||
&& (ISDIGIT ((unsigned char)scan[2]) || (scan[2] == 'Q')
|
||||
|| (scan[2] == 't') || (scan[2] == 'K') || (scan[2] == 'H')))
|
||||
{
|
||||
/* The ARM says nothing about the mangling of local variables.
|
||||
But cfront mangles local variables by prepending __<nesting_level>
|
||||
to them. As an extension to ARM demangling we handle this case. */
|
||||
if ((LUCID_DEMANGLING || ARM_DEMANGLING || HP_DEMANGLING)
|
||||
&& isdigit ((unsigned char)scan[2]))
|
||||
&& ISDIGIT ((unsigned char)scan[2]))
|
||||
{
|
||||
*mangled = scan + 2;
|
||||
consume_count (mangled);
|
||||
|
|
@ -2785,7 +2786,7 @@ demangle_prefix (work, mangled, declp)
|
|||
/* EDG template? */
|
||||
demangle_arm_hp_template (work, mangled, strlen (*mangled), declp);
|
||||
}
|
||||
else if ((scan == *mangled) && !isdigit ((unsigned char)scan[2])
|
||||
else if ((scan == *mangled) && !ISDIGIT ((unsigned char)scan[2])
|
||||
&& (scan[2] != 't'))
|
||||
{
|
||||
/* Mangled name starts with "__". Skip over any leading '_' characters,
|
||||
|
|
@ -2907,7 +2908,7 @@ gnu_special (work, mangled, declp)
|
|||
1);
|
||||
break;
|
||||
default:
|
||||
if (isdigit((unsigned char)*mangled[0]))
|
||||
if (ISDIGIT((unsigned char)*mangled[0]))
|
||||
{
|
||||
n = consume_count(mangled);
|
||||
/* We may be seeing a too-large size, or else a
|
||||
|
|
@ -3434,13 +3435,13 @@ get_count (type, count)
|
|||
const char *p;
|
||||
int n;
|
||||
|
||||
if (!isdigit ((unsigned char)**type))
|
||||
if (!ISDIGIT ((unsigned char)**type))
|
||||
return (0);
|
||||
else
|
||||
{
|
||||
*count = **type - '0';
|
||||
(*type)++;
|
||||
if (isdigit ((unsigned char)**type))
|
||||
if (ISDIGIT ((unsigned char)**type))
|
||||
{
|
||||
p = *type;
|
||||
n = *count;
|
||||
|
|
@ -3450,7 +3451,7 @@ get_count (type, count)
|
|||
n += *p - '0';
|
||||
p++;
|
||||
}
|
||||
while (isdigit ((unsigned char)*p));
|
||||
while (ISDIGIT ((unsigned char)*p));
|
||||
if (*p == '_')
|
||||
{
|
||||
*type = p + 1;
|
||||
|
|
@ -3580,7 +3581,7 @@ do_type (work, mangled, result)
|
|||
if (**mangled != 'Q')
|
||||
string_prepend (&decl, SCOPE_STRING (work));
|
||||
|
||||
if (isdigit ((unsigned char)**mangled))
|
||||
if (ISDIGIT ((unsigned char)**mangled))
|
||||
{
|
||||
n = consume_count (mangled);
|
||||
if (n == -1
|
||||
|
|
@ -3900,7 +3901,7 @@ demangle_fund_type (work, mangled, result)
|
|||
break;
|
||||
case 'G':
|
||||
(*mangled)++;
|
||||
if (!isdigit ((unsigned char)**mangled))
|
||||
if (!ISDIGIT ((unsigned char)**mangled))
|
||||
{
|
||||
success = 0;
|
||||
break;
|
||||
|
|
@ -4012,12 +4013,12 @@ do_hpacc_template_const_value (work, mangled, result)
|
|||
}
|
||||
|
||||
/* We have to be looking at an integer now */
|
||||
if (!(isdigit ((unsigned char)**mangled)))
|
||||
if (!(ISDIGIT ((unsigned char)**mangled)))
|
||||
return 0;
|
||||
|
||||
/* We only deal with integral values for template
|
||||
parameters -- so it's OK to look only for digits */
|
||||
while (isdigit ((unsigned char)**mangled))
|
||||
while (ISDIGIT ((unsigned char)**mangled))
|
||||
{
|
||||
char_str[0] = **mangled;
|
||||
string_append (result, char_str);
|
||||
|
|
@ -4096,10 +4097,10 @@ snarf_numeric_literal (args, arg)
|
|||
else if (**args == '+')
|
||||
(*args)++;
|
||||
|
||||
if (!isdigit ((unsigned char)**args))
|
||||
if (!ISDIGIT ((unsigned char)**args))
|
||||
return 0;
|
||||
|
||||
while (isdigit ((unsigned char)**args))
|
||||
while (ISDIGIT ((unsigned char)**args))
|
||||
{
|
||||
char_str[0] = **args;
|
||||
string_append (arg, char_str);
|
||||
|
|
@ -4663,8 +4664,8 @@ demangle_function_name (work, mangled, declp, scan)
|
|||
}
|
||||
}
|
||||
else if (declp->b[0] == '_' && declp->b[1] == '_'
|
||||
&& islower((unsigned char)declp->b[2])
|
||||
&& islower((unsigned char)declp->b[3]))
|
||||
&& ISLOWER((unsigned char)declp->b[2])
|
||||
&& ISLOWER((unsigned char)declp->b[3]))
|
||||
{
|
||||
if (declp->b[4] == '\0')
|
||||
{
|
||||
|
|
@ -5125,7 +5126,7 @@ main (argc, argv)
|
|||
int i = 0;
|
||||
c = getchar ();
|
||||
/* Try to read a label. */
|
||||
while (c != EOF && (isalnum (c) || strchr (valid_symbols, c)))
|
||||
while (c != EOF && (ISALNUM (c) || strchr (valid_symbols, c)))
|
||||
{
|
||||
if (i >= MBUF_SIZE-1)
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -45,8 +45,7 @@ Boston, MA 02111-1307, USA. */
|
|||
|
||||
#include <errno.h>
|
||||
#include <fnmatch.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#include <safe-ctype.h>
|
||||
|
||||
/* Comment out all this code if we are using the GNU C Library, and are not
|
||||
actually compiling the library itself. This code is part of the GNU C
|
||||
|
|
@ -74,8 +73,7 @@ fnmatch (pattern, string, flags)
|
|||
register const char *p = pattern, *n = string;
|
||||
register unsigned char c;
|
||||
|
||||
/* Note that this evalutes C many times. */
|
||||
#define FOLD(c) ((flags & FNM_CASEFOLD) && isupper (c) ? tolower (c) : (c))
|
||||
#define FOLD(c) ((flags & FNM_CASEFOLD) ? TOLOWER (c) : (c))
|
||||
|
||||
while ((c = *p++) != '\0')
|
||||
{
|
||||
|
|
|
|||
|
|
@ -41,12 +41,12 @@ extern int errno;
|
|||
#ifdef HAVE_STDLIB_H
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
#define ISSPACE (x) isspace(x)
|
||||
#ifdef HAVE_SYS_WAIT_H
|
||||
#include <sys/wait.h>
|
||||
#endif
|
||||
|
||||
#include "libiberty.h"
|
||||
#include "safe-ctype.h"
|
||||
|
||||
/* stdin file number. */
|
||||
#define STDIN_FILE_NO 0
|
||||
|
|
|
|||
162
libiberty/safe-ctype.c
Normal file
162
libiberty/safe-ctype.c
Normal file
|
|
@ -0,0 +1,162 @@
|
|||
/* <ctype.h> replacement macros.
|
||||
|
||||
Copyright (C) 2000 Free Software Foundation, Inc.
|
||||
Contributed by Zack Weinberg <zackw@stanford.edu>.
|
||||
|
||||
This file is part of the libiberty library.
|
||||
Libiberty is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
|
||||
Libiberty is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with libiberty; see the file COPYING.LIB. If
|
||||
not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
/* This is a compatible replacement of the standard C library's <ctype.h>
|
||||
with the following properties:
|
||||
|
||||
- Implements all isxxx() macros required by C99.
|
||||
- Also implements some character classes useful when
|
||||
parsing C-like languages.
|
||||
- Does not change behavior depending on the current locale.
|
||||
- Behaves properly for all values in the range of a signed or
|
||||
unsigned char. */
|
||||
|
||||
#include <safe-ctype.h>
|
||||
#include <stdio.h> /* for EOF */
|
||||
|
||||
/* Shorthand */
|
||||
#define bl _sch_isblank
|
||||
#define cn _sch_iscntrl
|
||||
#define di _sch_isdigit
|
||||
#define is _sch_isidst
|
||||
#define lo _sch_islower
|
||||
#define nv _sch_isnvsp
|
||||
#define pn _sch_ispunct
|
||||
#define pr _sch_isprint
|
||||
#define sp _sch_isspace
|
||||
#define up _sch_isupper
|
||||
#define vs _sch_isvsp
|
||||
#define xd _sch_isxdigit
|
||||
|
||||
/* Masks. */
|
||||
#define L lo|is |pr /* lower case letter */
|
||||
#define XL lo|is|xd|pr /* lowercase hex digit */
|
||||
#define U up|is |pr /* upper case letter */
|
||||
#define XU up|is|xd|pr /* uppercase hex digit */
|
||||
#define D di |xd|pr /* decimal digit */
|
||||
#define P pn |pr /* punctuation */
|
||||
#define _ pn|is |pr /* underscore */
|
||||
|
||||
#define C cn /* control character */
|
||||
#define Z nv |cn /* NUL */
|
||||
#define M nv|sp |cn /* cursor movement: \f \v */
|
||||
#define V vs|sp |cn /* vertical space: \r \n */
|
||||
#define T nv|sp|bl|cn /* tab */
|
||||
#define S nv|sp|bl|pr /* space */
|
||||
|
||||
/* Are we ASCII? */
|
||||
#if '\n' == 0x0A && ' ' == 0x20 && '0' == 0x30 \
|
||||
&& 'A' == 0x41 && 'a' == 0x61 && '!' == 0x21 \
|
||||
&& EOF == -1
|
||||
|
||||
const unsigned short _sch_istable[256] =
|
||||
{
|
||||
Z, C, C, C, C, C, C, C, /* NUL SOH STX ETX EOT ENQ ACK BEL */
|
||||
C, T, V, M, M, V, C, C, /* BS HT LF VT FF CR SO SI */
|
||||
C, C, C, C, C, C, C, C, /* DLE DC1 DC2 DC3 DC4 NAK SYN ETB */
|
||||
C, C, C, C, C, C, C, C, /* CAN EM SUB ESC FS GS RS US */
|
||||
S, P, P, P, P, P, P, P, /* SP ! " # $ % & ' */
|
||||
P, P, P, P, P, P, P, P, /* ( ) * + , - . / */
|
||||
D, D, D, D, D, D, D, D, /* 0 1 2 3 4 5 6 7 */
|
||||
D, D, P, P, P, P, P, P, /* 8 9 : ; < = > ? */
|
||||
P, XU, XU, XU, XU, XU, XU, U, /* @ A B C D E F G */
|
||||
U, U, U, U, U, U, U, U, /* H I J K L M N O */
|
||||
U, U, U, U, U, U, U, U, /* P Q R S T U V W */
|
||||
U, U, U, P, P, P, P, _, /* X Y Z [ \ ] ^ _ */
|
||||
P, XL, XL, XL, XL, XL, XL, L, /* ` a b c d e f g */
|
||||
L, L, L, L, L, L, L, L, /* h i j k l m n o */
|
||||
L, L, L, L, L, L, L, L, /* p q r s t u v w */
|
||||
L, L, L, P, P, P, P, C, /* x y z { | } ~ DEL */
|
||||
|
||||
/* high half of unsigned char is locale-specific, so all tests are
|
||||
false in "C" locale */
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
};
|
||||
|
||||
const unsigned char _sch_tolower[256] =
|
||||
{
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
|
||||
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
|
||||
32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
|
||||
48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
|
||||
64,
|
||||
|
||||
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
|
||||
'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
|
||||
|
||||
91, 92, 93, 94, 95, 96,
|
||||
|
||||
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
|
||||
'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
|
||||
|
||||
123,124,125,126,127,
|
||||
|
||||
128,129,130,131, 132,133,134,135, 136,137,138,139, 140,141,142,143,
|
||||
144,145,146,147, 148,149,150,151, 152,153,154,155, 156,157,158,159,
|
||||
160,161,162,163, 164,165,166,167, 168,169,170,171, 172,173,174,175,
|
||||
176,177,178,179, 180,181,182,183, 184,185,186,187, 188,189,190,191,
|
||||
|
||||
192,193,194,195, 196,197,198,199, 200,201,202,203, 204,205,206,207,
|
||||
208,209,210,211, 212,213,214,215, 216,217,218,219, 220,221,222,223,
|
||||
224,225,226,227, 228,229,230,231, 232,233,234,235, 236,237,238,239,
|
||||
240,241,242,243, 244,245,246,247, 248,249,250,251, 252,253,254,255,
|
||||
};
|
||||
|
||||
const unsigned char _sch_toupper[256] =
|
||||
{
|
||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
|
||||
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
|
||||
32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
|
||||
48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
|
||||
64,
|
||||
|
||||
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
|
||||
'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
||||
|
||||
91, 92, 93, 94, 95, 96,
|
||||
|
||||
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
|
||||
'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
||||
|
||||
123,124,125,126,127,
|
||||
|
||||
128,129,130,131, 132,133,134,135, 136,137,138,139, 140,141,142,143,
|
||||
144,145,146,147, 148,149,150,151, 152,153,154,155, 156,157,158,159,
|
||||
160,161,162,163, 164,165,166,167, 168,169,170,171, 172,173,174,175,
|
||||
176,177,178,179, 180,181,182,183, 184,185,186,187, 188,189,190,191,
|
||||
|
||||
192,193,194,195, 196,197,198,199, 200,201,202,203, 204,205,206,207,
|
||||
208,209,210,211, 212,213,214,215, 216,217,218,219, 220,221,222,223,
|
||||
224,225,226,227, 228,229,230,231, 232,233,234,235, 236,237,238,239,
|
||||
240,241,242,243, 244,245,246,247, 248,249,250,251, 252,253,254,255,
|
||||
};
|
||||
|
||||
#else
|
||||
#error "Unsupported host character set"
|
||||
#endif /* not ASCII */
|
||||
|
|
@ -22,7 +22,7 @@ the resulting executable to be covered by the GNU General Public License.
|
|||
This exception does not however invalidate any other reasons why
|
||||
the executable file might be covered by the GNU General Public License. */
|
||||
|
||||
#include <ctype.h>
|
||||
#include "safe-ctype.h"
|
||||
|
||||
extern double atof ();
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ strtod (str, ptr)
|
|||
|
||||
p = str;
|
||||
|
||||
while (isspace (*p))
|
||||
while (ISSPACE (*p))
|
||||
++p;
|
||||
|
||||
if (*p == '+' || *p == '-')
|
||||
|
|
@ -88,10 +88,10 @@ strtod (str, ptr)
|
|||
}
|
||||
|
||||
/* digits, with 0 or 1 periods in it. */
|
||||
if (isdigit (*p) || *p == '.')
|
||||
if (ISDIGIT (*p) || *p == '.')
|
||||
{
|
||||
int got_dot = 0;
|
||||
while (isdigit (*p) || (!got_dot && *p == '.'))
|
||||
while (ISDIGIT (*p) || (!got_dot && *p == '.'))
|
||||
{
|
||||
if (*p == '.')
|
||||
got_dot = 1;
|
||||
|
|
@ -105,9 +105,9 @@ strtod (str, ptr)
|
|||
i = 1;
|
||||
if (p[i] == '+' || p[i] == '-')
|
||||
++i;
|
||||
if (isdigit (p[i]))
|
||||
if (ISDIGIT (p[i]))
|
||||
{
|
||||
while (isdigit (p[i]))
|
||||
while (ISDIGIT (p[i]))
|
||||
++i;
|
||||
*ptr = p + i;
|
||||
return atof (str);
|
||||
|
|
|
|||
|
|
@ -37,15 +37,11 @@
|
|||
#ifdef HAVE_SYS_PARAM_H
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#ifdef NEED_DECLARATION_ERRNO
|
||||
extern int errno;
|
||||
#endif
|
||||
#if 0
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
#include "ansidecl.h"
|
||||
#include "safe-ctype.h"
|
||||
|
||||
/* FIXME: It'd be nice to configure around these, but the include files are too
|
||||
painful. These macros should at least be more portable than hardwired hex
|
||||
|
|
@ -88,7 +84,7 @@ strtol(nptr, endptr, base)
|
|||
*/
|
||||
do {
|
||||
c = *s++;
|
||||
} while (isspace(c));
|
||||
} while (ISSPACE(c));
|
||||
if (c == '-') {
|
||||
neg = 1;
|
||||
c = *s++;
|
||||
|
|
@ -124,10 +120,10 @@ strtol(nptr, endptr, base)
|
|||
cutlim = cutoff % (unsigned long)base;
|
||||
cutoff /= (unsigned long)base;
|
||||
for (acc = 0, any = 0;; c = *s++) {
|
||||
if (isdigit(c))
|
||||
if (ISDIGIT(c))
|
||||
c -= '0';
|
||||
else if (isalpha(c))
|
||||
c -= isupper(c) ? 'A' - 10 : 'a' - 10;
|
||||
else if (ISALPHA(c))
|
||||
c -= ISUPPER(c) ? 'A' - 10 : 'a' - 10;
|
||||
else
|
||||
break;
|
||||
if (c >= base)
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ strtoul(nptr, endptr, base)
|
|||
*/
|
||||
do {
|
||||
c = *s++;
|
||||
} while (isspace(c));
|
||||
} while (ISSPACE(c));
|
||||
if (c == '-') {
|
||||
neg = 1;
|
||||
c = *s++;
|
||||
|
|
@ -91,10 +91,10 @@ strtoul(nptr, endptr, base)
|
|||
cutoff = (unsigned long)ULONG_MAX / (unsigned long)base;
|
||||
cutlim = (unsigned long)ULONG_MAX % (unsigned long)base;
|
||||
for (acc = 0, any = 0;; c = *s++) {
|
||||
if (isdigit(c))
|
||||
if (ISDIGIT(c))
|
||||
c -= '0';
|
||||
else if (isalpha(c))
|
||||
c -= isupper(c) ? 'A' - 10 : 'a' - 10;
|
||||
else if (ISALPHA(c))
|
||||
c -= ISUPPER(c) ? 'A' - 10 : 'a' - 10;
|
||||
else
|
||||
break;
|
||||
if (c >= base)
|
||||
|
|
|
|||
Loading…
Reference in a new issue