cvs: php4 /ext/standard url.c

From: Date: Mon, 28 Apr 2003 16:24:14 +0000
Subject: cvs: php4 /ext/standard url.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-20542@lists.php.net to get a copy of this message
sas Mon Apr 28 12:24:14 2003 EDT Modified files: /php4/ext/standard url.c Log: improve php_url_encode Index: php4/ext/standard/url.c diff -u php4/ext/standard/url.c:1.64 php4/ext/standard/url.c:1.65 --- php4/ext/standard/url.c:1.64 Tue Feb 25 18:39:57 2003 +++ php4/ext/standard/url.c Mon Apr 28 12:24:14 2003 @@ -15,7 +15,7 @@ | Author: Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: url.c,v 1.64 2003/02/25 23:39:57 iliaa Exp $ */ +/* $Id: url.c,v 1.65 2003/04/28 16:24:14 sas Exp $ */ #include <stdlib.h> #include <string.h> @@ -361,37 +361,45 @@ */ PHPAPI char *php_url_encode(char *s, int len, int *new_length) { - register int x, y; - unsigned char *str; + register unsigned char c; + unsigned char *to, *from, *start; + unsigned char *end; + + from = s; + end = s + len; + start = to = (unsigned char *) emalloc(3 * len + 1); - str = (unsigned char *) emalloc(3 * len + 1); - for (x = 0, y = 0; len--; x++, y++) { - str[y] = (unsigned char) s[x]; - if (str[y] == ' ') { - str[y] = '+'; + while (from < end) { + c = *from++; + + if (c == ' ') { + *to++ = '+'; #ifndef CHARSET_EBCDIC - } else if ((str[y] < '0' && str[y] != '-' && str[y] != '.') || - (str[y] < 'A' && str[y] > '9') || - (str[y] > 'Z' && str[y] < 'a' && str[y] != '_') || - (str[y] > 'z')) { - str[y++] = '%'; - str[y++] = hexchars[(unsigned char) s[x] >> 4]; - str[y] = hexchars[(unsigned char) s[x] & 15]; - } + } else if ((c < '0' && c != '-' && c != '.') || + (c < 'A' && c > '9') || + (c > 'Z' && c < 'a' && c != '_') || + (c > 'z')) { + to[0] = '%'; + to[1] = hexchars[(unsigned char) c >> 4]; + to[2] = hexchars[(unsigned char) c & 15]; + to += 3; #else /*CHARSET_EBCDIC*/ - } else if (!isalnum(str[y]) && strchr("_-.", str[y]) == NULL) { + } else if (!isalnum(c) && strchr("_-.", c) == NULL) { /* Allow only alphanumeric chars and '_', '-', '.'; escape the rest */ - str[y++] = '%'; - str[y++] = hexchars[os_toascii[(unsigned char) s[x]] >> 4]; - str[y] = hexchars[os_toascii[(unsigned char) s[x]] & 0x0F]; - } + to[0] = '%'; + to[1] = hexchars[os_toascii[(unsigned char) c] >> 4]; + to[2] = hexchars[os_toascii[(unsigned char) c] & 15]; + to += 3; #endif /*CHARSET_EBCDIC*/ + } else { + *to++ = c; + } } - str[y] = '\0'; + *to = 0; if (new_length) { - *new_length = y; + *new_length = to - start; } - return ((char *) str); + return (char *) start; } /* }}} */

« previous php.cvs (#20542) next »