2002-09-03 13:52:59 +02:00
|
|
|
/***************************************************************************
|
2004-06-24 16:35:45 +02:00
|
|
|
* _ _ ____ _
|
|
|
|
* Project ___| | | | _ \| |
|
|
|
|
* / __| | | | |_) | |
|
|
|
|
* | (__| |_| | _ <| |___
|
1999-12-29 15:20:26 +01:00
|
|
|
* \___|\___/|_| \_\_____|
|
|
|
|
*
|
2006-04-07 23:50:47 +02:00
|
|
|
* Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
|
1999-12-29 15:20:26 +01:00
|
|
|
*
|
2002-09-03 13:52:59 +02:00
|
|
|
* 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.
|
2004-06-24 16:35:45 +02:00
|
|
|
*
|
2001-01-03 10:29:33 +01:00
|
|
|
* 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
|
2002-09-03 13:52:59 +02:00
|
|
|
* furnished to do so, under the terms of the COPYING file.
|
1999-12-29 15:20:26 +01:00
|
|
|
*
|
2001-01-03 10:29:33 +01:00
|
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
|
|
* KIND, either express or implied.
|
1999-12-29 15:20:26 +01:00
|
|
|
*
|
2001-01-03 10:29:33 +01:00
|
|
|
* $Id$
|
2002-09-03 13:52:59 +02:00
|
|
|
***************************************************************************/
|
1999-12-29 15:20:26 +01:00
|
|
|
|
|
|
|
/* Escape and unescape URL encoding in strings. The functions return a new
|
|
|
|
* allocated string or NULL if an error occurred. */
|
|
|
|
|
2000-08-31 14:03:04 +02:00
|
|
|
#include "setup.h"
|
2001-03-22 19:06:08 +01:00
|
|
|
#include <ctype.h>
|
2000-08-31 14:03:04 +02:00
|
|
|
#include <curl/curl.h>
|
|
|
|
|
1999-12-29 15:20:26 +01:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2004-05-11 13:30:23 +02:00
|
|
|
#include "memory.h"
|
2006-04-07 23:50:47 +02:00
|
|
|
/* urldata.h and easyif.h are included for Curl_convert_... prototypes */
|
|
|
|
#include "urldata.h"
|
|
|
|
#include "easyif.h"
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2004-06-24 16:35:45 +02:00
|
|
|
#define _MPRINTF_REPLACE /* use our functions only */
|
|
|
|
#include <curl/mprintf.h>
|
|
|
|
|
2000-10-09 13:12:34 +02:00
|
|
|
/* The last #include file should be: */
|
|
|
|
#include "memdebug.h"
|
|
|
|
|
2006-04-07 23:50:47 +02:00
|
|
|
/* for ABI-compatibility with previous versions */
|
2004-07-01 10:10:21 +02:00
|
|
|
char *curl_escape(const char *string, int inlength)
|
2006-04-07 23:50:47 +02:00
|
|
|
{
|
|
|
|
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)
|
1999-12-29 15:20:26 +01:00
|
|
|
{
|
2004-07-01 10:10:21 +02:00
|
|
|
size_t alloc = (inlength?(size_t)inlength:strlen(string))+1;
|
2004-05-12 15:04:30 +02:00
|
|
|
char *ns;
|
2003-01-08 03:27:47 +01:00
|
|
|
char *testing_ptr = NULL;
|
2001-03-22 12:40:58 +01:00
|
|
|
unsigned char in;
|
2004-03-08 09:38:29 +01:00
|
|
|
size_t newlen = alloc;
|
2004-01-29 14:56:45 +01:00
|
|
|
int strindex=0;
|
2004-07-01 10:10:21 +02:00
|
|
|
size_t length;
|
1999-12-29 15:20:26 +01:00
|
|
|
|
2006-04-07 23:50:47 +02:00
|
|
|
#ifndef CURL_DOES_CONVERSIONS
|
|
|
|
/* avoid compiler warnings */
|
|
|
|
(void)handle;
|
|
|
|
#endif
|
2004-05-12 15:04:30 +02:00
|
|
|
ns = malloc(alloc);
|
|
|
|
if(!ns)
|
|
|
|
return NULL;
|
|
|
|
|
2001-04-07 20:35:28 +02:00
|
|
|
length = alloc-1;
|
2001-03-22 12:40:58 +01:00
|
|
|
while(length--) {
|
|
|
|
in = *string;
|
2002-06-26 09:15:31 +02:00
|
|
|
if(!(in >= 'a' && in <= 'z') &&
|
|
|
|
!(in >= 'A' && in <= 'Z') &&
|
|
|
|
!(in >= '0' && in <= '9')) {
|
2001-03-22 12:40:58 +01:00
|
|
|
/* encode it */
|
2001-08-05 14:34:07 +02:00
|
|
|
newlen += 2; /* the size grows with two, since this'll become a %XX */
|
|
|
|
if(newlen > alloc) {
|
|
|
|
alloc *= 2;
|
2003-01-08 03:27:47 +01:00
|
|
|
testing_ptr = realloc(ns, alloc);
|
|
|
|
if(!testing_ptr) {
|
|
|
|
free( ns );
|
2001-08-05 14:34:07 +02:00
|
|
|
return NULL;
|
2003-01-08 03:27:47 +01:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
ns = testing_ptr;
|
|
|
|
}
|
2001-03-22 19:06:08 +01:00
|
|
|
}
|
2006-04-07 23:50:47 +02:00
|
|
|
|
|
|
|
#ifdef CURL_DOES_CONVERSIONS
|
|
|
|
/* escape sequences are always in ASCII so convert them on non-ASCII hosts */
|
|
|
|
if (!handle ||
|
|
|
|
(Curl_convert_to_network(handle, &in, 1) != CURLE_OK)) {
|
|
|
|
/* Curl_convert_to_network calls failf if unsuccessful */
|
|
|
|
free(ns);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif /* CURL_DOES_CONVERSIONS */
|
|
|
|
|
2004-06-24 13:54:11 +02:00
|
|
|
snprintf(&ns[strindex], 4, "%%%02X", in);
|
2001-03-22 19:06:08 +01:00
|
|
|
|
2004-01-29 14:56:45 +01:00
|
|
|
strindex+=3;
|
2001-03-22 12:40:58 +01:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* just copy this */
|
2004-01-29 14:56:45 +01:00
|
|
|
ns[strindex++]=in;
|
2001-03-22 12:40:58 +01:00
|
|
|
}
|
|
|
|
string++;
|
|
|
|
}
|
2004-01-29 14:56:45 +01:00
|
|
|
ns[strindex]=0; /* terminate it */
|
2001-03-22 12:40:58 +01:00
|
|
|
return ns;
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
|
|
|
|
2006-04-07 23:50:47 +02:00
|
|
|
char *curl_easy_unescape(CURL *handle, const char *string, int length,
|
|
|
|
int *olen)
|
1999-12-29 15:20:26 +01:00
|
|
|
{
|
2001-08-14 10:20:17 +02:00
|
|
|
int alloc = (length?length:(int)strlen(string))+1;
|
2001-03-22 12:40:58 +01:00
|
|
|
char *ns = malloc(alloc);
|
|
|
|
unsigned char in;
|
2004-01-29 14:56:45 +01:00
|
|
|
int strindex=0;
|
2004-03-08 09:38:29 +01:00
|
|
|
long hex;
|
2004-06-24 16:35:45 +02:00
|
|
|
|
2006-04-07 23:50:47 +02:00
|
|
|
#ifndef CURL_DOES_CONVERSIONS
|
|
|
|
/* avoid compiler warnings */
|
|
|
|
(void)handle;
|
|
|
|
#endif
|
2004-05-12 15:04:30 +02:00
|
|
|
if( !ns )
|
2003-01-08 03:27:47 +01:00
|
|
|
return NULL;
|
2004-06-24 16:35:45 +02:00
|
|
|
|
2001-03-22 12:40:58 +01:00
|
|
|
while(--alloc > 0) {
|
|
|
|
in = *string;
|
2006-10-17 23:32:56 +02:00
|
|
|
if(('%' == in) && ISXDIGIT(string[1]) && ISXDIGIT(string[2])) {
|
2003-05-21 17:53:59 +02:00
|
|
|
/* this is two hexadecimal digits following a '%' */
|
|
|
|
char hexstr[3];
|
|
|
|
char *ptr;
|
|
|
|
hexstr[0] = string[1];
|
|
|
|
hexstr[1] = string[2];
|
|
|
|
hexstr[2] = 0;
|
|
|
|
|
|
|
|
hex = strtol(hexstr, &ptr, 16);
|
|
|
|
|
2004-03-08 09:38:29 +01:00
|
|
|
in = (unsigned char)hex; /* this long is never bigger than 255 anyway */
|
2006-04-07 23:50:47 +02:00
|
|
|
|
|
|
|
#ifdef CURL_DOES_CONVERSIONS
|
|
|
|
/* escape sequences are always in ASCII so convert them on non-ASCII hosts */
|
|
|
|
if (!handle ||
|
|
|
|
(Curl_convert_from_network(handle, &in, 1) != CURLE_OK)) {
|
|
|
|
/* Curl_convert_from_network calls failf if unsuccessful */
|
|
|
|
free(ns);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif /* CURL_DOES_CONVERSIONS */
|
|
|
|
|
2003-05-21 17:53:59 +02:00
|
|
|
string+=2;
|
|
|
|
alloc-=2;
|
2001-03-22 12:40:58 +01:00
|
|
|
}
|
2004-06-24 16:35:45 +02:00
|
|
|
|
2004-01-29 14:56:45 +01:00
|
|
|
ns[strindex++] = in;
|
2001-03-22 12:40:58 +01:00
|
|
|
string++;
|
|
|
|
}
|
2004-01-29 14:56:45 +01:00
|
|
|
ns[strindex]=0; /* terminate it */
|
2006-04-07 23:50:47 +02:00
|
|
|
|
|
|
|
if(olen)
|
|
|
|
/* store output size */
|
|
|
|
*olen = strindex;
|
2001-03-22 12:40:58 +01:00
|
|
|
return ns;
|
1999-12-29 15:20:26 +01:00
|
|
|
}
|
2001-09-07 06:01:32 +02:00
|
|
|
|
2003-05-21 17:53:59 +02:00
|
|
|
/* For operating systems/environments that use different malloc/free
|
|
|
|
ssystems for the app and for this library, we provide a free that uses
|
|
|
|
the library's memory system */
|
2002-09-25 14:26:07 +02:00
|
|
|
void curl_free(void *p)
|
|
|
|
{
|
2004-05-13 17:16:36 +02:00
|
|
|
if(p)
|
|
|
|
free(p);
|
2002-09-25 14:26:07 +02:00
|
|
|
}
|