5b6e7927c6
93 lib/*.c source files renamed to use our standard naming scheme. This commit only does the file renaming. ---------------------------------------- renamed: lib/amigaos.c -> lib/curl_amigaos.c renamed: lib/asyn-ares.c -> lib/curl_asyn_ares.c renamed: lib/asyn-thread.c -> lib/curl_asyn_thread.c renamed: lib/axtls.c -> lib/curl_axtls.c renamed: lib/base64.c -> lib/curl_base64.c renamed: lib/bundles.c -> lib/curl_bundles.c renamed: lib/conncache.c -> lib/curl_conncache.c renamed: lib/connect.c -> lib/curl_connect.c renamed: lib/content_encoding.c -> lib/curl_content_encoding.c renamed: lib/cookie.c -> lib/curl_cookie.c renamed: lib/cyassl.c -> lib/curl_cyassl.c renamed: lib/dict.c -> lib/curl_dict.c renamed: lib/easy.c -> lib/curl_easy.c renamed: lib/escape.c -> lib/curl_escape.c renamed: lib/file.c -> lib/curl_file.c renamed: lib/fileinfo.c -> lib/curl_fileinfo.c renamed: lib/formdata.c -> lib/curl_formdata.c renamed: lib/ftp.c -> lib/curl_ftp.c renamed: lib/ftplistparser.c -> lib/curl_ftplistparser.c renamed: lib/getenv.c -> lib/curl_getenv.c renamed: lib/getinfo.c -> lib/curl_getinfo.c renamed: lib/gopher.c -> lib/curl_gopher.c renamed: lib/gtls.c -> lib/curl_gtls.c renamed: lib/hash.c -> lib/curl_hash.c renamed: lib/hmac.c -> lib/curl_hmac.c renamed: lib/hostasyn.c -> lib/curl_hostasyn.c renamed: lib/hostcheck.c -> lib/curl_hostcheck.c renamed: lib/hostip.c -> lib/curl_hostip.c renamed: lib/hostip4.c -> lib/curl_hostip4.c renamed: lib/hostip6.c -> lib/curl_hostip6.c renamed: lib/hostsyn.c -> lib/curl_hostsyn.c renamed: lib/http.c -> lib/curl_http.c renamed: lib/http_chunks.c -> lib/curl_http_chunks.c renamed: lib/http_digest.c -> lib/curl_http_digest.c renamed: lib/http_negotiate.c -> lib/curl_http_negotiate.c renamed: lib/http_negotiate_sspi.c -> lib/curl_http_negotiate_sspi.c renamed: lib/http_proxy.c -> lib/curl_http_proxy.c renamed: lib/idn_win32.c -> lib/curl_idn_win32.c renamed: lib/if2ip.c -> lib/curl_if2ip.c renamed: lib/imap.c -> lib/curl_imap.c renamed: lib/inet_ntop.c -> lib/curl_inet_ntop.c renamed: lib/inet_pton.c -> lib/curl_inet_pton.c renamed: lib/krb4.c -> lib/curl_krb4.c renamed: lib/krb5.c -> lib/curl_krb5.c renamed: lib/ldap.c -> lib/curl_ldap.c renamed: lib/llist.c -> lib/curl_llist.c renamed: lib/md4.c -> lib/curl_md4.c renamed: lib/md5.c -> lib/curl_md5.c renamed: lib/memdebug.c -> lib/curl_memdebug.c renamed: lib/mprintf.c -> lib/curl_mprintf.c renamed: lib/multi.c -> lib/curl_multi.c renamed: lib/netrc.c -> lib/curl_netrc.c renamed: lib/non-ascii.c -> lib/curl_non_ascii.c renamed: lib/curl_non-ascii.h -> lib/curl_non_ascii.h renamed: lib/nonblock.c -> lib/curl_nonblock.c renamed: lib/nss.c -> lib/curl_nss.c renamed: lib/nwlib.c -> lib/curl_nwlib.c renamed: lib/nwos.c -> lib/curl_nwos.c renamed: lib/openldap.c -> lib/curl_openldap.c renamed: lib/parsedate.c -> lib/curl_parsedate.c renamed: lib/pingpong.c -> lib/curl_pingpong.c renamed: lib/polarssl.c -> lib/curl_polarssl.c renamed: lib/pop3.c -> lib/curl_pop3.c renamed: lib/progress.c -> lib/curl_progress.c renamed: lib/qssl.c -> lib/curl_qssl.c renamed: lib/rawstr.c -> lib/curl_rawstr.c renamed: lib/rtsp.c -> lib/curl_rtsp.c renamed: lib/security.c -> lib/curl_security.c renamed: lib/select.c -> lib/curl_select.c renamed: lib/sendf.c -> lib/curl_sendf.c renamed: lib/share.c -> lib/curl_share.c renamed: lib/slist.c -> lib/curl_slist.c renamed: lib/smtp.c -> lib/curl_smtp.c renamed: lib/socks.c -> lib/curl_socks.c renamed: lib/socks_gssapi.c -> lib/curl_socks_gssapi.c renamed: lib/socks_sspi.c -> lib/curl_socks_sspi.c renamed: lib/speedcheck.c -> lib/curl_speedcheck.c renamed: lib/splay.c -> lib/curl_splay.c renamed: lib/ssh.c -> lib/curl_ssh.c renamed: lib/sslgen.c -> lib/curl_sslgen.c renamed: lib/ssluse.c -> lib/curl_ssluse.c renamed: lib/strdup.c -> lib/curl_strdup.c renamed: lib/strequal.c -> lib/curl_strequal.c renamed: lib/strerror.c -> lib/curl_strerror.c renamed: lib/strtok.c -> lib/curl_strtok.c renamed: lib/strtoofft.c -> lib/curl_strtoofft.c renamed: lib/telnet.c -> lib/curl_telnet.c renamed: lib/tftp.c -> lib/curl_tftp.c renamed: lib/timeval.c -> lib/curl_timeval.c renamed: lib/transfer.c -> lib/curl_transfer.c renamed: lib/url.c -> lib/curl_url.c renamed: lib/version.c -> lib/curl_version.c renamed: lib/warnless.c -> lib/curl_warnless.c renamed: lib/wildcard.c -> lib/curl_wildcard.c ----------------------------------------
234 lines
6.4 KiB
C
234 lines
6.4 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2013, 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 "curl_urldata.h"
|
|
#include "curl_warnless.h"
|
|
#include "curl_non_ascii.h"
|
|
#include "curl_escape.h"
|
|
|
|
#define _MPRINTF_REPLACE /* use our functions only */
|
|
#include <curl/mprintf.h>
|
|
|
|
/* The last #include file should be: */
|
|
#include "curl_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);
|
|
}
|