mirror of
https://github.com/moparisthebest/curl
synced 2024-12-23 08:38:49 -05:00
7f41432c19
Commit3c630f9b0a
partially reverted the changes from commitdd7521bcc1
because of the problem that strcpy_url() was modified unilaterally without also modifying strlen_url(). As a consequence strcpy_url() was again depending on ASCII encoding. This change fixes strlen_url() and strcpy_url() in parallel to use a common host-encoding independent criterion for deciding whether an URL character must be %-escaped. Closes #2535
82 lines
3.1 KiB
C
82 lines
3.1 KiB
C
#ifndef HEADER_CURL_CTYPE_H
|
|
#define HEADER_CURL_CTYPE_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#ifdef CURL_DOES_CONVERSIONS
|
|
|
|
/*
|
|
* Uppercase macro versions of ANSI/ISO is*() functions/macros which
|
|
* avoid negative number inputs with argument byte codes > 127.
|
|
*
|
|
* For non-ASCII platforms the C library character classification routines
|
|
* are used despite being locale-dependent, because this is better than
|
|
* not to work at all.
|
|
*/
|
|
#include <ctype.h>
|
|
|
|
#define ISSPACE(x) (isspace((int) ((unsigned char)x)))
|
|
#define ISDIGIT(x) (isdigit((int) ((unsigned char)x)))
|
|
#define ISALNUM(x) (isalnum((int) ((unsigned char)x)))
|
|
#define ISXDIGIT(x) (isxdigit((int) ((unsigned char)x)))
|
|
#define ISGRAPH(x) (isgraph((int) ((unsigned char)x)))
|
|
#define ISALPHA(x) (isalpha((int) ((unsigned char)x)))
|
|
#define ISPRINT(x) (isprint((int) ((unsigned char)x)))
|
|
#define ISUPPER(x) (isupper((int) ((unsigned char)x)))
|
|
#define ISLOWER(x) (islower((int) ((unsigned char)x)))
|
|
#define ISCNTRL(x) (iscntrl((int) ((unsigned char)x)))
|
|
#define ISASCII(x) (isascii((int) ((unsigned char)x)))
|
|
|
|
#else
|
|
|
|
int Curl_isspace(int c);
|
|
int Curl_isdigit(int c);
|
|
int Curl_isalnum(int c);
|
|
int Curl_isxdigit(int c);
|
|
int Curl_isgraph(int c);
|
|
int Curl_isprint(int c);
|
|
int Curl_isalpha(int c);
|
|
int Curl_isupper(int c);
|
|
int Curl_islower(int c);
|
|
int Curl_iscntrl(int c);
|
|
|
|
#define ISSPACE(x) (Curl_isspace((int) ((unsigned char)x)))
|
|
#define ISDIGIT(x) (Curl_isdigit((int) ((unsigned char)x)))
|
|
#define ISALNUM(x) (Curl_isalnum((int) ((unsigned char)x)))
|
|
#define ISXDIGIT(x) (Curl_isxdigit((int) ((unsigned char)x)))
|
|
#define ISGRAPH(x) (Curl_isgraph((int) ((unsigned char)x)))
|
|
#define ISALPHA(x) (Curl_isalpha((int) ((unsigned char)x)))
|
|
#define ISPRINT(x) (Curl_isprint((int) ((unsigned char)x)))
|
|
#define ISUPPER(x) (Curl_isupper((int) ((unsigned char)x)))
|
|
#define ISLOWER(x) (Curl_islower((int) ((unsigned char)x)))
|
|
#define ISCNTRL(x) (Curl_iscntrl((int) ((unsigned char)x)))
|
|
#define ISASCII(x) (((x) >= 0) && ((x) <= 0x80))
|
|
|
|
#endif
|
|
|
|
#define ISBLANK(x) (int)((((unsigned char)x) == ' ') || \
|
|
(((unsigned char)x) == '\t'))
|
|
|
|
#endif /* HEADER_CURL_CTYPE_H */
|