summaryrefslogtreecommitdiff
path: root/lib/escape.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2007-08-04 20:47:59 +0000
committerDaniel Stenberg <daniel@haxx.se>2007-08-04 20:47:59 +0000
commit1926f4573d43f35f33b524d120e847ea819cc7c7 (patch)
tree9c19380b002d623c94747daee0edb941542451cc /lib/escape.c
parent7fe65aaf5bda5f48eebcc3f694485b2bc6b49d6c (diff)
downloadcurl-1926f4573d43f35f33b524d120e847ea819cc7c7.tar.gz
Patrick Monnerat fixed curl_easy_escape() and curlx_strtoll() to work on
non-ASCII systems.
Diffstat (limited to 'lib/escape.c')
-rw-r--r--lib/escape.c29
1 files changed, 22 insertions, 7 deletions
diff --git a/lib/escape.c b/lib/escape.c
index 9552b0f31..06ac04d71 100644
--- a/lib/escape.c
+++ b/lib/escape.c
@@ -75,9 +75,27 @@ char *curl_easy_escape(CURL *handle, const char *string, int inlength)
length = alloc-1;
while(length--) {
in = *string;
- if(!(in >= 'a' && in <= 'z') &&
- !(in >= 'A' && in <= 'Z') &&
- !(in >= '0' && in <= '9')) {
+
+ /* Portable character check (remember EBCDIC). Do not use isalnum() because
+ its behavior is altered by the current locale. */
+
+ 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':
+ /* just copy this */
+ ns[strindex++]=in;
+ break;
+ default:
/* encode it */
newlen += 2; /* the size grows with two, since this'll become a %XX */
if(newlen > alloc) {
@@ -105,10 +123,7 @@ char *curl_easy_escape(CURL *handle, const char *string, int inlength)
snprintf(&ns[strindex], 4, "%%%02X", in);
strindex+=3;
- }
- else {
- /* just copy this */
- ns[strindex++]=in;
+ break;
}
string++;
}