Added url_auto_canonicalize().

diff --git a/lib/url.c b/lib/url.c
index 73e3b50134b1d3e6a75c7a0385a19be8c99944b6..a6dcf7aa06fe4f1335edbe921359136b17bed1dc 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -500,7 +500,7 @@ url_error(uns err)
   return errmsg[err];
 }
 
-/* A "macro" for canonical split */
+/* Standard cookbook recipes */
 
 int
 url_canon_split(byte *u, byte *buf1, byte *buf2, struct url *url)
@@ -516,6 +516,19 @@ url_canon_split(byte *u, byte *buf1, byte *buf2, struct url *url)
   return url_canonicalize(url);
 }
 
+int
+url_auto_canonicalize(byte *src, byte *dst)
+{
+  byte buf1[MAX_URL_SIZE], buf2[MAX_URL_SIZE], buf3[MAX_URL_SIZE];
+  int err;
+  struct url ur;
+
+  (void)((err = url_canon_split(src, buf1, buf2, &ur)) ||
+   (err = url_pack(&ur, buf3)) ||
+   (err = url_enescape(buf3, dst)));
+  return err;
+}
+
 /* Testing */
 
 #ifdef TEST

diff --git a/lib/url.h b/lib/url.h
index 0c2751298eca8267cd2882d23b97706381a13184..baa44f42398912a978898de40e76cede24b38d1d 100644 (file)
--- a/lib/url.h
+++ b/lib/url.h
@@ -46,6 +46,7 @@ int url_normalize(struct url *, struct url *);
 int url_canonicalize(struct url *);
 int url_pack(struct url *, byte *);
 int url_canon_split(byte *, byte *, byte *, struct url *);
+int url_auto_canonicalize(byte *, byte *);
 uns identify_protocol(byte *);
 int url_has_repeated_component(byte *url);