mirror of
https://github.com/moparisthebest/curl
synced 2024-11-04 16:45:06 -05:00
7f41432c19
Commit3c630f9b0apartially reverted the changes from commitdd7521bcc1because 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
134 lines
3.5 KiB
C
134 lines
3.5 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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"
|
|
|
|
#ifndef CURL_DOES_CONVERSIONS
|
|
|
|
#undef _U
|
|
#define _U (1<<0) /* upper case */
|
|
#undef _L
|
|
#define _L (1<<1) /* lower case */
|
|
#undef _N
|
|
#define _N (1<<2) /* decimal numerical digit */
|
|
#undef _S
|
|
#define _S (1<<3) /* space */
|
|
#undef _P
|
|
#define _P (1<<4) /* punctuation */
|
|
#undef _C
|
|
#define _C (1<<5) /* control */
|
|
#undef _X
|
|
#define _X (1<<6) /* hexadecimal letter */
|
|
#undef _B
|
|
#define _B (1<<7) /* blank */
|
|
|
|
static const unsigned char ascii[128] = {
|
|
_C, _C, _C, _C, _C, _C, _C, _C,
|
|
_C, _C|_S, _C|_S, _C|_S, _C|_S, _C|_S, _C, _C,
|
|
_C, _C, _C, _C, _C, _C, _C, _C,
|
|
_C, _C, _C, _C, _C, _C, _C, _C,
|
|
_S|_B, _P, _P, _P, _P, _P, _P, _P,
|
|
_P, _P, _P, _P, _P, _P, _P, _P,
|
|
_N, _N, _N, _N, _N, _N, _N, _N,
|
|
_N, _N, _P, _P, _P, _P, _P, _P,
|
|
_P, _U|_X, _U|_X, _U|_X, _U|_X, _U|_X, _U|_X, _U,
|
|
_U, _U, _U, _U, _U, _U, _U, _U,
|
|
_U, _U, _U, _U, _U, _U, _U, _U,
|
|
_U, _U, _U, _P, _P, _P, _P, _P,
|
|
_P, _L|_X, _L|_X, _L|_X, _L|_X, _L|_X, _L|_X, _L,
|
|
_L, _L, _L, _L, _L, _L, _L, _L,
|
|
_L, _L, _L, _L, _L, _L, _L, _L,
|
|
_L, _L, _L, _P, _P, _P, _P, _C
|
|
};
|
|
|
|
int Curl_isspace(int c)
|
|
{
|
|
if((c < 0) || (c >= 0x80))
|
|
return FALSE;
|
|
return (ascii[c] & _S);
|
|
}
|
|
|
|
int Curl_isdigit(int c)
|
|
{
|
|
if((c < 0) || (c >= 0x80))
|
|
return FALSE;
|
|
return (ascii[c] & _N);
|
|
}
|
|
|
|
int Curl_isalnum(int c)
|
|
{
|
|
if((c < 0) || (c >= 0x80))
|
|
return FALSE;
|
|
return (ascii[c] & (_N|_U|_L));
|
|
}
|
|
|
|
int Curl_isxdigit(int c)
|
|
{
|
|
if((c < 0) || (c >= 0x80))
|
|
return FALSE;
|
|
return (ascii[c] & (_N|_X));
|
|
}
|
|
|
|
int Curl_isgraph(int c)
|
|
{
|
|
if((c < 0) || (c >= 0x80) || (c == ' '))
|
|
return FALSE;
|
|
return (ascii[c] & (_N|_X|_U|_L|_P|_S));
|
|
}
|
|
|
|
int Curl_isprint(int c)
|
|
{
|
|
if((c < 0) || (c >= 0x80))
|
|
return FALSE;
|
|
return (ascii[c] & (_N|_X|_U|_L|_P|_S));
|
|
}
|
|
|
|
int Curl_isalpha(int c)
|
|
{
|
|
if((c < 0) || (c >= 0x80))
|
|
return FALSE;
|
|
return (ascii[c] & (_U|_L));
|
|
}
|
|
|
|
int Curl_isupper(int c)
|
|
{
|
|
if((c < 0) || (c >= 0x80))
|
|
return FALSE;
|
|
return (ascii[c] & (_U));
|
|
}
|
|
|
|
int Curl_islower(int c)
|
|
{
|
|
if((c < 0) || (c >= 0x80))
|
|
return FALSE;
|
|
return (ascii[c] & (_L));
|
|
}
|
|
|
|
int Curl_iscntrl(int c)
|
|
{
|
|
if((c < 0) || (c >= 0x80))
|
|
return FALSE;
|
|
return (ascii[c] & (_C));
|
|
}
|
|
|
|
#endif /* !CURL_DOES_CONVERSIONS */
|