2002-09-03 07:52:59 -04:00
|
|
|
/***************************************************************************
|
2004-06-24 10:35:45 -04:00
|
|
|
* _ _ ____ _
|
|
|
|
* Project ___| | | | _ \| |
|
|
|
|
* / __| | | | |_) | |
|
|
|
|
* | (__| |_| | _ <| |___
|
1999-12-29 09:20:26 -05:00
|
|
|
* \___|\___/|_| \_\_____|
|
|
|
|
*
|
2004-01-07 04:19:33 -05:00
|
|
|
* Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
|
1999-12-29 09:20:26 -05:00
|
|
|
*
|
2002-09-03 07:52:59 -04: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 10:35:45 -04:00
|
|
|
*
|
2001-01-03 04:29:33 -05: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 07:52:59 -04:00
|
|
|
* furnished to do so, under the terms of the COPYING file.
|
1999-12-29 09:20:26 -05:00
|
|
|
*
|
2001-01-03 04:29:33 -05:00
|
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
|
|
* KIND, either express or implied.
|
1999-12-29 09:20:26 -05:00
|
|
|
*
|
2001-01-03 04:29:33 -05:00
|
|
|
* $Id$
|
2002-09-03 07:52:59 -04:00
|
|
|
***************************************************************************/
|
1999-12-29 09:20:26 -05:00
|
|
|
|
|
|
|
/* Escape and unescape URL encoding in strings. The functions return a new
|
|
|
|
* allocated string or NULL if an error occurred. */
|
|
|
|
|
2000-08-31 08:03:04 -04:00
|
|
|
#include "setup.h"
|
2001-03-22 13:06:08 -05:00
|
|
|
#include <ctype.h>
|
2000-08-31 08:03:04 -04:00
|
|
|
#include <curl/curl.h>
|
|
|
|
|
1999-12-29 09:20:26 -05:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2004-05-11 07:30:23 -04:00
|
|
|
#include "memory.h"
|
1999-12-29 09:20:26 -05:00
|
|
|
|
2004-06-24 10:35:45 -04:00
|
|
|
#define _MPRINTF_REPLACE /* use our functions only */
|
|
|
|
#include <curl/mprintf.h>
|
|
|
|
|
2000-10-09 07:12:34 -04:00
|
|
|
/* The last #include file should be: */
|
|
|
|
#include "memdebug.h"
|
|
|
|
|
2004-07-01 04:10:21 -04:00
|
|
|
char *curl_escape(const char *string, int inlength)
|
1999-12-29 09:20:26 -05:00
|
|
|
{
|
2004-07-01 04:10:21 -04:00
|
|
|
size_t alloc = (inlength?(size_t)inlength:strlen(string))+1;
|
2004-05-12 09:04:30 -04:00
|
|
|
char *ns;
|
2003-01-07 21:27:47 -05:00
|
|
|
char *testing_ptr = NULL;
|
2001-03-22 06:40:58 -05:00
|
|
|
unsigned char in;
|
2004-03-08 03:38:29 -05:00
|
|
|
size_t newlen = alloc;
|
2004-01-29 08:56:45 -05:00
|
|
|
int strindex=0;
|
2004-07-01 04:10:21 -04:00
|
|
|
size_t length;
|
1999-12-29 09:20:26 -05:00
|
|
|
|
2004-05-12 09:04:30 -04:00
|
|
|
ns = malloc(alloc);
|
|
|
|
if(!ns)
|
|
|
|
return NULL;
|
|
|
|
|
2001-04-07 14:35:28 -04:00
|
|
|
length = alloc-1;
|
2001-03-22 06:40:58 -05:00
|
|
|
while(length--) {
|
|
|
|
in = *string;
|
2002-06-26 03:15:31 -04:00
|
|
|
if(!(in >= 'a' && in <= 'z') &&
|
|
|
|
!(in >= 'A' && in <= 'Z') &&
|
|
|
|
!(in >= '0' && in <= '9')) {
|
2001-03-22 06:40:58 -05:00
|
|
|
/* encode it */
|
2001-08-05 08:34:07 -04:00
|
|
|
newlen += 2; /* the size grows with two, since this'll become a %XX */
|
|
|
|
if(newlen > alloc) {
|
|
|
|
alloc *= 2;
|
2003-01-07 21:27:47 -05:00
|
|
|
testing_ptr = realloc(ns, alloc);
|
|
|
|
if(!testing_ptr) {
|
|
|
|
free( ns );
|
2001-08-05 08:34:07 -04:00
|
|
|
return NULL;
|
2003-01-07 21:27:47 -05:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
ns = testing_ptr;
|
|
|
|
}
|
2001-03-22 13:06:08 -05:00
|
|
|
}
|
2004-06-24 07:54:11 -04:00
|
|
|
snprintf(&ns[strindex], 4, "%%%02X", in);
|
2001-03-22 13:06:08 -05:00
|
|
|
|
2004-01-29 08:56:45 -05:00
|
|
|
strindex+=3;
|
2001-03-22 06:40:58 -05:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* just copy this */
|
2004-01-29 08:56:45 -05:00
|
|
|
ns[strindex++]=in;
|
2001-03-22 06:40:58 -05:00
|
|
|
}
|
|
|
|
string++;
|
|
|
|
}
|
2004-01-29 08:56:45 -05:00
|
|
|
ns[strindex]=0; /* terminate it */
|
2001-03-22 06:40:58 -05:00
|
|
|
return ns;
|
1999-12-29 09:20:26 -05:00
|
|
|
}
|
|
|
|
|
2003-05-21 11:53:59 -04:00
|
|
|
#define ishex(in) ((in >= 'a' && in <= 'f') || \
|
|
|
|
(in >= 'A' && in <= 'F') || \
|
|
|
|
(in >= '0' && in <= '9'))
|
|
|
|
|
2001-08-21 09:18:07 -04:00
|
|
|
char *curl_unescape(const char *string, int length)
|
1999-12-29 09:20:26 -05:00
|
|
|
{
|
2001-08-14 04:20:17 -04:00
|
|
|
int alloc = (length?length:(int)strlen(string))+1;
|
2001-03-22 06:40:58 -05:00
|
|
|
char *ns = malloc(alloc);
|
|
|
|
unsigned char in;
|
2004-01-29 08:56:45 -05:00
|
|
|
int strindex=0;
|
2004-03-08 03:38:29 -05:00
|
|
|
long hex;
|
2004-06-24 10:35:45 -04:00
|
|
|
|
2004-05-12 09:04:30 -04:00
|
|
|
if( !ns )
|
2003-01-07 21:27:47 -05:00
|
|
|
return NULL;
|
2004-06-24 10:35:45 -04:00
|
|
|
|
2001-03-22 06:40:58 -05:00
|
|
|
while(--alloc > 0) {
|
|
|
|
in = *string;
|
2003-05-21 11:53:59 -04:00
|
|
|
if(('%' == in) && ishex(string[1]) && ishex(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 = strtol(hexstr, &ptr, 16);
|
|
|
|
|
2004-03-08 03:38:29 -05:00
|
|
|
in = (unsigned char)hex; /* this long is never bigger than 255 anyway */
|
2003-05-21 11:53:59 -04:00
|
|
|
string+=2;
|
|
|
|
alloc-=2;
|
2001-03-22 06:40:58 -05:00
|
|
|
}
|
2004-06-24 10:35:45 -04:00
|
|
|
|
2004-01-29 08:56:45 -05:00
|
|
|
ns[strindex++] = in;
|
2001-03-22 06:40:58 -05:00
|
|
|
string++;
|
|
|
|
}
|
2004-01-29 08:56:45 -05:00
|
|
|
ns[strindex]=0; /* terminate it */
|
2001-03-22 06:40:58 -05:00
|
|
|
return ns;
|
1999-12-29 09:20:26 -05:00
|
|
|
}
|
2001-09-07 00:01:32 -04:00
|
|
|
|
2003-05-21 11:53:59 -04: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 08:26:07 -04:00
|
|
|
void curl_free(void *p)
|
|
|
|
{
|
2004-05-13 11:16:36 -04:00
|
|
|
if(p)
|
|
|
|
free(p);
|
2002-09-25 08:26:07 -04:00
|
|
|
}
|