mirror of
https://github.com/moparisthebest/curl
synced 2024-11-04 16:45:06 -05:00
5a053ffe80
This commit renames lib/setup.h to lib/curl_setup.h and renames lib/setup_once.h to lib/curl_setup_once.h. Removes the need and usage of a header inclusion guard foreign to libcurl. [1] Removes the need and presence of an alarming notice we carried in old setup_once.h [2] ---------------------------------------- 1 - lib/setup_once.h used __SETUP_ONCE_H macro as header inclusion guard up to commitec691ca3
which changed this to HEADER_CURL_SETUP_ONCE_H, this single inclusion guard is enough to ensure that inclusion of lib/setup_once.h done from lib/setup.h is only done once. Additionally lib/setup.h has always used __SETUP_ONCE_H macro to protect inclusion of setup_once.h even after commitec691ca3
, this was to avoid a circular header inclusion triggered when building a c-ares enabled version with c-ares sources available which also has a setup_once.h header. Commitec691ca3
exposes the real nature of __SETUP_ONCE_H usage in lib/setup.h, it is a header inclusion guard foreign to libcurl belonging to c-ares's setup_once.h The renaming this commit does, fixes the circular header inclusion, and as such removes the need and usage of a header inclusion guard foreign to libcurl. Macro __SETUP_ONCE_H no longer used in libcurl. 2 - Due to the circular interdependency of old lib/setup_once.h and the c-ares setup_once.h header, old file lib/setup_once.h has carried back from 2006 up to now days an alarming and prominent notice about the need of keeping libcurl's and c-ares's setup_once.h in sync. Given that this commit fixes the circular interdependency, the need and presence of mentioned notice is removed. All mentioned interdependencies come back from now old days when the c-ares project lived inside a curl subdirectory. This commit removes last traces of such fact.
234 lines
6.4 KiB
C
234 lines
6.4 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2011, 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 http://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.
|
|
*
|
|
***************************************************************************/
|
|
|
|
/* Escape and unescape URL encoding in strings. The functions return a new
|
|
* allocated string or NULL if an error occurred. */
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#include <curl/curl.h>
|
|
|
|
#include "curl_memory.h"
|
|
#include "urldata.h"
|
|
#include "warnless.h"
|
|
#include "non-ascii.h"
|
|
#include "escape.h"
|
|
|
|
#define _MPRINTF_REPLACE /* use our functions only */
|
|
#include <curl/mprintf.h>
|
|
|
|
/* The last #include file should be: */
|
|
#include "memdebug.h"
|
|
|
|
/* Portable character check (remember EBCDIC). Do not use isalnum() because
|
|
its behavior is altered by the current locale.
|
|
See http://tools.ietf.org/html/rfc3986#section-2.3
|
|
*/
|
|
static bool Curl_isunreserved(unsigned char in)
|
|
{
|
|
switch (in) {
|
|
case '0': case '1': case '2': case '3': case '4':
|
|
case '5': case '6': case '7': case '8': case '9':
|
|
case 'a': case 'b': case 'c': case 'd': case 'e':
|
|
case 'f': case 'g': case 'h': case 'i': case 'j':
|
|
case 'k': case 'l': case 'm': case 'n': case 'o':
|
|
case 'p': case 'q': case 'r': case 's': case 't':
|
|
case 'u': case 'v': case 'w': case 'x': case 'y': case 'z':
|
|
case 'A': case 'B': case 'C': case 'D': case 'E':
|
|
case 'F': case 'G': case 'H': case 'I': case 'J':
|
|
case 'K': case 'L': case 'M': case 'N': case 'O':
|
|
case 'P': case 'Q': case 'R': case 'S': case 'T':
|
|
case 'U': case 'V': case 'W': case 'X': case 'Y': case 'Z':
|
|
case '-': case '.': case '_': case '~':
|
|
return TRUE;
|
|
default:
|
|
break;
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
/* for ABI-compatibility with previous versions */
|
|
char *curl_escape(const char *string, int inlength)
|
|
{
|
|
return curl_easy_escape(NULL, string, inlength);
|
|
}
|
|
|
|
/* for ABI-compatibility with previous versions */
|
|
char *curl_unescape(const char *string, int length)
|
|
{
|
|
return curl_easy_unescape(NULL, string, length, NULL);
|
|
}
|
|
|
|
char *curl_easy_escape(CURL *handle, const char *string, int inlength)
|
|
{
|
|
size_t alloc = (inlength?(size_t)inlength:strlen(string))+1;
|
|
char *ns;
|
|
char *testing_ptr = NULL;
|
|
unsigned char in; /* we need to treat the characters unsigned */
|
|
size_t newlen = alloc;
|
|
size_t strindex=0;
|
|
size_t length;
|
|
CURLcode res;
|
|
|
|
ns = malloc(alloc);
|
|
if(!ns)
|
|
return NULL;
|
|
|
|
length = alloc-1;
|
|
while(length--) {
|
|
in = *string;
|
|
|
|
if(Curl_isunreserved(in))
|
|
/* just copy this */
|
|
ns[strindex++]=in;
|
|
else {
|
|
/* encode it */
|
|
newlen += 2; /* the size grows with two, since this'll become a %XX */
|
|
if(newlen > alloc) {
|
|
alloc *= 2;
|
|
testing_ptr = realloc(ns, alloc);
|
|
if(!testing_ptr) {
|
|
free( ns );
|
|
return NULL;
|
|
}
|
|
else {
|
|
ns = testing_ptr;
|
|
}
|
|
}
|
|
|
|
res = Curl_convert_to_network(handle, &in, 1);
|
|
if(res) {
|
|
/* Curl_convert_to_network calls failf if unsuccessful */
|
|
free(ns);
|
|
return NULL;
|
|
}
|
|
|
|
snprintf(&ns[strindex], 4, "%%%02X", in);
|
|
|
|
strindex+=3;
|
|
}
|
|
string++;
|
|
}
|
|
ns[strindex]=0; /* terminate it */
|
|
return ns;
|
|
}
|
|
|
|
/*
|
|
* Curl_urldecode() URL decodes the given string.
|
|
*
|
|
* Optionally detects control characters (byte codes lower than 32) in the
|
|
* data and rejects such data.
|
|
*
|
|
* Returns a pointer to a malloced string in *ostring with length given in
|
|
* *olen. If length == 0, the length is assumed to be strlen(string).
|
|
*
|
|
*/
|
|
CURLcode Curl_urldecode(struct SessionHandle *data,
|
|
const char *string, size_t length,
|
|
char **ostring, size_t *olen,
|
|
bool reject_ctrl)
|
|
{
|
|
size_t alloc = (length?length:strlen(string))+1;
|
|
char *ns = malloc(alloc);
|
|
unsigned char in;
|
|
size_t strindex=0;
|
|
unsigned long hex;
|
|
CURLcode res;
|
|
|
|
if(!ns)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
while(--alloc > 0) {
|
|
in = *string;
|
|
if(('%' == in) && ISXDIGIT(string[1]) && ISXDIGIT(string[2])) {
|
|
/* this is two hexadecimal digits following a '%' */
|
|
char hexstr[3];
|
|
char *ptr;
|
|
hexstr[0] = string[1];
|
|
hexstr[1] = string[2];
|
|
hexstr[2] = 0;
|
|
|
|
hex = strtoul(hexstr, &ptr, 16);
|
|
|
|
in = curlx_ultouc(hex); /* this long is never bigger than 255 anyway */
|
|
|
|
res = Curl_convert_from_network(data, &in, 1);
|
|
if(res) {
|
|
/* Curl_convert_from_network calls failf if unsuccessful */
|
|
free(ns);
|
|
return res;
|
|
}
|
|
|
|
string+=2;
|
|
alloc-=2;
|
|
}
|
|
if(reject_ctrl && (in < 0x20)) {
|
|
free(ns);
|
|
return CURLE_URL_MALFORMAT;
|
|
}
|
|
|
|
ns[strindex++] = in;
|
|
string++;
|
|
}
|
|
ns[strindex]=0; /* terminate it */
|
|
|
|
if(olen)
|
|
/* store output size */
|
|
*olen = strindex;
|
|
|
|
if(ostring)
|
|
/* store output string */
|
|
*ostring = ns;
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
/*
|
|
* Unescapes the given URL escaped string of given length. Returns a
|
|
* pointer to a malloced string with length given in *olen.
|
|
* If length == 0, the length is assumed to be strlen(string).
|
|
* If olen == NULL, no output length is stored.
|
|
*/
|
|
char *curl_easy_unescape(CURL *handle, const char *string, int length,
|
|
int *olen)
|
|
{
|
|
char *str = NULL;
|
|
size_t inputlen = length;
|
|
size_t outputlen;
|
|
CURLcode res = Curl_urldecode(handle, string, inputlen, &str, &outputlen,
|
|
FALSE);
|
|
if(res)
|
|
return NULL;
|
|
if(olen)
|
|
*olen = curlx_uztosi(outputlen);
|
|
return str;
|
|
}
|
|
|
|
/* For operating systems/environments that use different malloc/free
|
|
systems for the app and for this library, we provide a free that uses
|
|
the library's memory system */
|
|
void curl_free(void *p)
|
|
{
|
|
if(p)
|
|
free(p);
|
|
}
|