Another attempt to do the fix right

[libucw.git] / ucw / url.h

diff --git a/ucw/url.h b/ucw/url.h
index aee20715d3c2a7a6f6aae8c9bc6b52bfeaba401e..c389fb16a9a9b72b8acc0e16a34307b6c7a4a04e 100644 (file)
--- a/ucw/url.h
+++ b/ucw/url.h
@@ -24,15 +24,23 @@ enum {
   NCC_EQUAL = 6,
   NCC_AND = 7,
   NCC_HASH = 8,
+#ifdef CONFIG_URL_ESCAPE_COMPAT
+  NCC_MAX = 9
+#else
   // Avoid 9 (\t) and 10 (\n)
   NCC_DOLLAR = 11,
   NCC_PLUS = 12,
   // Avoid 13 (\r)
   NCC_COMMA = 14,
   NCC_MAX = 15
+#endif
 };
 
+#ifdef CONFIG_URL_ESCAPE_COMPAT
+#define NCC_CHARS " ;/?:@=&#"
+#else
 #define NCC_CHARS " ;/?:@=&#\t\n$+\r,"
+#endif
 
 /* Remove/Introduce '%' escapes */
 
@@ -59,7 +67,7 @@ int url_canonicalize(struct url *u);
 int url_pack(struct url *u, char *d);
 int url_canon_split_rel(const char *url, char *buf1, char *buf2, struct url *u, struct url *base);
 int url_auto_canonicalize_rel(const char *src, char *dst, struct url *base);
-uns identify_protocol(const char *p);
+uns url_identify_protocol(const char *p);
 int url_has_repeated_component(const char *url);
 
 static inline int url_canon_split(const char *url, char *buf1, char *buf2, struct url *u)