UCW::CGI error handling split off to separate module UCW::CGI::ErrorHandler

[libucw.git] / ucw / url.c

diff --git a/ucw/url.c b/ucw/url.c
index 39e52946e2bd086cd3cbdaefa4985fe217b56fde..6d940018d2165acbb27124bb094a16ff958bcc0a 100644 (file)
--- a/ucw/url.c
+++ b/ucw/url.c
@@ -10,11 +10,11 @@
  *     XXX: The buffer handling in this module is really horrible, but it works.
  */
 
  *     XXX: The buffer handling in this module is really horrible, but it works.
  */
 

-#include "ucw/lib.h"
-#include "ucw/url.h"
-#include "ucw/chartype.h"
-#include "ucw/conf.h"
-#include "ucw/prime.h"
+#include <ucw/lib.h>
+#include <ucw/url.h>
+#include <ucw/chartype.h>
+#include <ucw/conf.h>
+#include <ucw/prime.h>

 
 #include <string.h>
 #include <stdlib.h>
 
 #include <string.h>
 #include <stdlib.h>


@@ -92,14 +92,12 @@ url_deescape(const char *s, char *d)
              val = NCC_AND; break;
            case '#':
              val = NCC_HASH; break;
              val = NCC_AND; break;
            case '#':
              val = NCC_HASH; break;

-#ifndef CONFIG_URL_ESCAPE_COMPAT

            case '$':
              val = NCC_DOLLAR; break;
            case '+':
              val = NCC_PLUS; break;
            case ',':
              val = NCC_COMMA; break;
            case '$':
              val = NCC_DOLLAR; break;
            case '+':
              val = NCC_PLUS; break;
            case ',':
              val = NCC_COMMA; break;

-#endif

            }
          *d++ = val;
          s += 3;
            }
          *d++ = val;
          s += 3;


@@ -142,10 +140,7 @@ url_enescape(const char *s, char *d)
          c == '!' || c == '*' || c == '\'' || c == '(' || c == ')' ||  /* ... and some exceptions and reserved chars */
          c == '$' || c == '-' || c == '_' || c == '.' || c == '+' ||
          c == ',' || c == '=' || c == '&' || c == '#' || c == ';' ||
          c == '!' || c == '*' || c == '\'' || c == '(' || c == ')' ||  /* ... and some exceptions and reserved chars */
          c == '$' || c == '-' || c == '_' || c == '.' || c == '+' ||
          c == ',' || c == '=' || c == '&' || c == '#' || c == ';' ||

-         c == '/' || c == '?' || c == ':' || c == '@'
-#ifndef CONFIG_URL_ESCAPE_COMPAT
-         || c == '~'
-#endif
+         c == '/' || c == '?' || c == ':' || c == '@' || c == '~'

        )
        *d++ = *s++;
       else
        )
        *d++ = *s++;
       else