X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/blobdiff_plain/d16e1bacb6473e14398ef81b6d2379f982f43969..eae919b59938b827743e7542b6e529a5183c21ea:/url.c

diff --git a/url.c b/url.c
index 75b6ff9..5943841 100644
--- a/url.c
+++ b/url.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: url.c,v 1.2 1999/09/03 08:02:05 mdw Exp $
+ * $Id: url.c,v 1.5 2004/04/08 01:36:13 mdw Exp $
  *
  * Parsing and construction of url-encoded name/value pairs
  *
@@ -27,19 +27,9 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: url.c,v $
- * Revision 1.2  1999/09/03 08:02:05  mdw
- * Make `#' a special character which needs escaping.
- *
- * Revision 1.1  1999/06/01 09:49:48  mdw
- * New files for url-encoding and decoding.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -81,15 +71,10 @@ static void encode(dstr *d, const char *p)
 	DPUTC(d, '+');
         break;
       default:
-        if (*p >= 33 && *p < 127)
+        if (isalnum((unsigned char)*p))
 	  DPUTC(d, *p);
         else
-      case '&':
-      case '+':
-      case '=':
-      case '%':
-      case '#':
-	dstr_putf(d, "%%%02x", *p);
+	  dstr_putf(d, "%%%02x", *p);
         break;
     }
     p++;