cvs: php4(PHP_4_3) /ext/standard url.c
| From: | Sascha Schumann | Date: | Mon, 28 Apr 2003 16:18:34 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/standard url.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20541@lists.php.net to get a copy of this message | ||
sas Mon Apr 28 12:18:34 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard url.c
Log:
# on working disk again
reverting code, moving to correct branch
Index: php4/ext/standard/url.c
diff -u php4/ext/standard/url.c:1.58.2.6 php4/ext/standard/url.c:1.58.2.7
--- php4/ext/standard/url.c:1.58.2.6 Mon Apr 28 11:17:00 2003
+++ php4/ext/standard/url.c Mon Apr 28 12:18:34 2003
@@ -15,7 +15,7 @@
| Author: Jim Winstead <jimw@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: url.c,v 1.58.2.6 2003/04/28 15:17:00 sas Exp $ */
+/* $Id: url.c,v 1.58.2.7 2003/04/28 16:18:34 sas Exp $ */
#include <stdlib.h>
#include <string.h>
@@ -361,45 +361,37 @@
*/
PHPAPI char *php_url_encode(char *s, int len, int *new_length)
{
- 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);
+ register int x, y;
+ unsigned char *str;
- while (from < end) {
- c = *from++;
-
- if (c == ' ') {
- *to++ = '+';
+ 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] = '+';
#ifndef CHARSET_EBCDIC
- } 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 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 /*CHARSET_EBCDIC*/
- } else if (!isalnum(c) && strchr("_-.", c) == NULL) {
+ } else if (!isalnum(str[y]) && strchr("_-.", str[y]) == NULL) {
/* Allow only alphanumeric chars and '_', '-', '.'; escape the
rest */
- 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++] = '%';
+ str[y++] = hexchars[os_toascii[(unsigned char) s[x]] >> 4];
+ str[y] = hexchars[os_toascii[(unsigned char) s[x]] & 0x0F];
}
+#endif /*CHARSET_EBCDIC*/
}
- *to = 0;
+ str[y] = '\0';
if (new_length) {
- *new_length = to - start;
+ *new_length = y;
}
- return (char *) start;
+ return ((char *) str);
}
/* }}} */