mirror of
https://github.com/moparisthebest/wget
synced 2024-07-03 16:38:41 -04:00
Replaced safe-ctype.[ch] with gnulib's c-ctype.
This commit is contained in:
Micah Cowan
parent
4aad4fe616
commit
5d3248ebae
@ -596,7 +596,7 @@ log_dump_context (void)
|
|||||||
/* String escape functions. */
|
/* String escape functions. */
|
||||||
|
|
||||||
/* Return the number of non-printable characters in SOURCE.
|
/* Return the number of non-printable characters in SOURCE.
|
||||||
Non-printable characters are determined as per safe-ctype.c. */
|
Non-printable characters are determined as per c-ctype.c. */
|
||||||
|
|
||||||
static int
|
static int
|
||||||
count_nonprint (const char *source)
|
count_nonprint (const char *source)
|
||||||
|
|||||||
171
src/safe-ctype.c
171
src/safe-ctype.c
@ -1,171 +0,0 @@
|
|||||||
/* <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 3 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. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
In addition, as a special exception, the Free Software Foundation
|
|
||||||
gives permission to link the code of its release of Wget with the
|
|
||||||
OpenSSL project's "OpenSSL" library (or with modified versions of it
|
|
||||||
that use the same license as the "OpenSSL" library), and distribute
|
|
||||||
the linked executables. You must obey the GNU General Public License
|
|
||||||
in all respects for all of the code used other than "OpenSSL". If you
|
|
||||||
modify this file, you may extend this exception to your version of the
|
|
||||||
file, but you are not obligated to do so. If you do not wish to do
|
|
||||||
so, delete this exception statement from your version. */
|
|
||||||
|
|
||||||
/* 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 <config.h>
|
|
||||||
#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 */
|
|
||||||
129
src/safe-ctype.h
129
src/safe-ctype.h
@ -1,129 +0,0 @@
|
|||||||
/* <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 3 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. If not, see
|
|
||||||
<http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
In addition, as a special exception, the Free Software Foundation
|
|
||||||
gives permission to link the code of its release of Wget with the
|
|
||||||
OpenSSL project's "OpenSSL" library (or with modified versions of it
|
|
||||||
that use the same license as the "OpenSSL" library), and distribute
|
|
||||||
the linked executables. You must obey the GNU General Public License
|
|
||||||
in all respects for all of the code used other than "OpenSSL". If you
|
|
||||||
modify this file, you may extend this exception to your version of the
|
|
||||||
file, but you are not obligated to do so. If you do not wish to do
|
|
||||||
so, delete this exception statement from your version. */
|
|
||||||
|
|
||||||
/* 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.
|
|
||||||
|
|
||||||
To avoid conflicts, this header defines the isxxx functions in upper
|
|
||||||
case, e.g. ISALPHA not isalpha. */
|
|
||||||
|
|
||||||
#ifndef SAFE_CTYPE_H
|
|
||||||
#define SAFE_CTYPE_H
|
|
||||||
|
|
||||||
/* Catch erroneous use of ctype macros. Files that really know what
|
|
||||||
they're doing can disable this check by defining the
|
|
||||||
I_REALLY_WANT_CTYPE_MACROS preprocessor constant. */
|
|
||||||
|
|
||||||
#ifndef I_REALLY_WANT_CTYPE_MACROS
|
|
||||||
|
|
||||||
/* We used to #define these to errors, but that loses when real
|
|
||||||
ctype.h is included, usually by a library's (OpenSSL's) header
|
|
||||||
which gets #included after wget.h. */
|
|
||||||
|
|
||||||
#undef isalpha
|
|
||||||
#undef isalnum
|
|
||||||
#undef isblank
|
|
||||||
#undef iscntrl
|
|
||||||
#undef isdigit
|
|
||||||
#undef isgraph
|
|
||||||
#undef islower
|
|
||||||
#undef isprint
|
|
||||||
#undef ispunct
|
|
||||||
#undef isspace
|
|
||||||
#undef isupper
|
|
||||||
#undef isxdigit
|
|
||||||
|
|
||||||
#endif /* I_REALLY_WANT_CTYPE_MACROS */
|
|
||||||
|
|
||||||
/* Categories. */
|
|
||||||
|
|
||||||
enum {
|
|
||||||
/* In C99 */
|
|
||||||
_sch_isblank = 0x0001, /* space \t */
|
|
||||||
_sch_iscntrl = 0x0002, /* nonprinting characters */
|
|
||||||
_sch_isdigit = 0x0004, /* 0-9 */
|
|
||||||
_sch_islower = 0x0008, /* a-z */
|
|
||||||
_sch_isprint = 0x0010, /* any printing character including ' ' */
|
|
||||||
_sch_ispunct = 0x0020, /* all punctuation */
|
|
||||||
_sch_isspace = 0x0040, /* space \t \n \r \f \v */
|
|
||||||
_sch_isupper = 0x0080, /* A-Z */
|
|
||||||
_sch_isxdigit = 0x0100, /* 0-9A-Fa-f */
|
|
||||||
|
|
||||||
/* Extra categories useful to cpplib. */
|
|
||||||
_sch_isidst = 0x0200, /* A-Za-z_ */
|
|
||||||
_sch_isvsp = 0x0400, /* \n \r */
|
|
||||||
_sch_isnvsp = 0x0800, /* space \t \f \v \0 */
|
|
||||||
|
|
||||||
/* Combinations of the above. */
|
|
||||||
_sch_isalpha = _sch_isupper|_sch_islower, /* A-Za-z */
|
|
||||||
_sch_isalnum = _sch_isalpha|_sch_isdigit, /* A-Za-z0-9 */
|
|
||||||
_sch_isidnum = _sch_isidst|_sch_isdigit, /* A-Za-z0-9_ */
|
|
||||||
_sch_isgraph = _sch_isalnum|_sch_ispunct, /* isprint and not space */
|
|
||||||
_sch_iscppsp = _sch_isvsp|_sch_isnvsp /* isspace + \0 */
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Character classification. */
|
|
||||||
extern const unsigned short _sch_istable[256];
|
|
||||||
|
|
||||||
#define _sch_test(c, bit) (_sch_istable[(c) & 0xff] & (unsigned short)(bit))
|
|
||||||
|
|
||||||
#define ISALPHA(c) _sch_test(c, _sch_isalpha)
|
|
||||||
#define ISALNUM(c) _sch_test(c, _sch_isalnum)
|
|
||||||
#define ISBLANK(c) _sch_test(c, _sch_isblank)
|
|
||||||
#define ISCNTRL(c) _sch_test(c, _sch_iscntrl)
|
|
||||||
#define ISDIGIT(c) _sch_test(c, _sch_isdigit)
|
|
||||||
#define ISGRAPH(c) _sch_test(c, _sch_isgraph)
|
|
||||||
#define ISLOWER(c) _sch_test(c, _sch_islower)
|
|
||||||
#define ISPRINT(c) _sch_test(c, _sch_isprint)
|
|
||||||
#define ISPUNCT(c) _sch_test(c, _sch_ispunct)
|
|
||||||
#define ISSPACE(c) _sch_test(c, _sch_isspace)
|
|
||||||
#define ISUPPER(c) _sch_test(c, _sch_isupper)
|
|
||||||
#define ISXDIGIT(c) _sch_test(c, _sch_isxdigit)
|
|
||||||
|
|
||||||
#define ISIDNUM(c) _sch_test(c, _sch_isidnum)
|
|
||||||
#define ISIDST(c) _sch_test(c, _sch_isidst)
|
|
||||||
#define IS_VSPACE(c) _sch_test(c, _sch_isvsp)
|
|
||||||
#define IS_NVSPACE(c) _sch_test(c, _sch_isnvsp)
|
|
||||||
#define IS_SPACE_OR_NUL(c) _sch_test(c, _sch_iscppsp)
|
|
||||||
|
|
||||||
/* Character transformation. */
|
|
||||||
extern const unsigned char _sch_toupper[256];
|
|
||||||
extern const unsigned char _sch_tolower[256];
|
|
||||||
#define TOUPPER(c) _sch_toupper[(c) & 0xff]
|
|
||||||
#define TOLOWER(c) _sch_tolower[(c) & 0xff]
|
|
||||||
|
|
||||||
#endif /* SAFE_CTYPE_H */
|
|
||||||
@ -80,7 +80,7 @@ so, delete this exception statement from your version. */
|
|||||||
/* Include these, so random files need not include them. */
|
/* Include these, so random files need not include them. */
|
||||||
#include "sysdep.h"
|
#include "sysdep.h"
|
||||||
/* locale independent replacement for ctype.h */
|
/* locale independent replacement for ctype.h */
|
||||||
#include "safe-ctype.h"
|
#include "c-ctype.h"
|
||||||
|
|
||||||
/* Conditionalize the use of GCC's __attribute__((format)) and
|
/* Conditionalize the use of GCC's __attribute__((format)) and
|
||||||
__builtin_expect features using macros. */
|
__builtin_expect features using macros. */
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user