Commit as 2.1.0.

[mLib] / url.c

diff --git a/url.c b/url.c
index d859bfa922087a6bea68b8a7211cdec2ef2c88bf..797c5364926abe66a00aa4eaa3f3f3ded0f80d33 100644 (file)
--- a/url.c
+++ b/url.c
@@ -7,7 +7,7 @@
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of the mLib utilities library.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * mLib is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with mLib; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -52,7 +52,8 @@ void url_initenc(url_ectx *ctx) { ctx->f = 0; }
 
 /* --- @encode@ --- *
  *
- * Arguments:  @dstr *d@ = pointer to output string
+ * Arguments:  @url_ectx *ctx@ = encoding context
+ *             @dstr *d@ = pointer to output string
  *             @const char *p@ = pointer to thing to encode
  *
  * Returns:    ---
@@ -60,19 +61,36 @@ void url_initenc(url_ectx *ctx) { ctx->f = 0; }
  * Use:                Encodes the input string into the output string.
  */
 
-static void encode(dstr *d, const char *p)
+static void encode(url_ectx *ctx, dstr *d, const char *p)
 {
   while (*p) {
     switch (*p) {
       case ' ':
        DPUTC(d, '+');
-        break;
+       break;
       default:
-        if (isalnum((unsigned char)*p))
-         DPUTC(d, *p);
-        else
-         dstr_putf(d, "%%%02x", *p);
-        break;
+       if ((ctx->f & URLF_LAX) || isalnum((unsigned char)*p))
+         goto safe;
+       else
+         goto unsafe;
+      case '/':
+      case '~':
+       if (ctx->f & URLF_STRICT)
+         goto unsafe;
+      case '-':
+      case '.':
+      case '_':
+      safe:
+       DPUTC(d, *p);
+       break;
+      unsafe:
+      case '+':
+      case '%':
+      case '=':
+      case '&':
+      case ';':
+       dstr_putf(d, "%%%02x", *p);
+       break;
     }
     p++;
   }
@@ -94,10 +112,10 @@ static void encode(dstr *d, const char *p)
 void url_enc(url_ectx *ctx, dstr *d, const char *name, const char *value)
 {
   if (ctx->f & URLF_SEP)
-    DPUTC(d, '&');
-  encode(d, name);
+    DPUTC(d, (ctx->f & URLF_SEMI) ? ';' : '&');
+  encode(ctx, d, name);
   DPUTC(d, '=');
-  encode(d, value);
+  encode(ctx, d, value);
   DPUTZ(d);
   ctx->f |= URLF_SEP;
 }
@@ -112,11 +130,12 @@ void url_enc(url_ectx *ctx, dstr *d, const char *name, const char *value)
  * Use:                Initializes a URL decoding context.
  */
 
-void url_initdec(url_dctx *ctx, const char *p) { ctx->p = p; }
+void url_initdec(url_dctx *ctx, const char *p) { ctx->p = p; ctx->f = 0; }
 
 /* --- @decode@ --- *
  *
- * Arguments:  @dstr *d@ = pointer to output string
+ * Arguments:  @url_dctx *ctx@ = pointer to the context
+ *             @dstr *d@ = pointer to output string
  *             @const char *p@ = pointer to input data
  *             @int eq@ = whether to stop at `=' characters
  *
@@ -125,7 +144,7 @@ void url_initdec(url_dctx *ctx, const char *p) { ctx->p = p; }
  * Use:                Does a URL decode.
  */
 
-static const char *decode(dstr *d, const char *p, int eq)
+static const char *decode(url_dctx *ctx, dstr *d, const char *p, int eq)
 {
   if (!*p)
     return (0);
@@ -134,8 +153,11 @@ static const char *decode(dstr *d, const char *p, int eq)
       case '=':
        if (eq)
          return (p);
-       DPUTC(d, *p);
-       break;
+       goto boring;
+      case ';':
+       if (ctx->f & URLF_SEMI)
+         return (p);
+       goto boring;
       case 0:
       case '&':
        return (p);
@@ -153,6 +175,7 @@ static const char *decode(dstr *d, const char *p, int eq)
        }
       }
       default:
+      boring:
        DPUTC(d, *p);
        break;
     }
@@ -177,7 +200,7 @@ int url_dec(url_dctx *ctx, dstr *n, dstr *v)
   size_t l = n->len;
 
 again:
-  if ((p = decode(n, p, 1)) == 0 || *p == 0)
+  if ((p = decode(ctx, n, p, 1)) == 0 || *p == 0)
     return (0);
   if (*p != '=') {
     p++;
@@ -185,7 +208,7 @@ again:
     goto again;
   }
   p++;
-  if ((p = decode(v, p, 0)) == 0)
+  if ((p = decode(ctx, v, p, 0)) == 0)
     return (0);
   DPUTZ(n);
   DPUTZ(v);