X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Furl.c;h=d5cbcea21a34d718b7e9b70f6ee09131574deaa4;hb=4394a6c303de4d94972f9a7b37a52f6cd799690c;hp=f805e32ff23f0f994dda2f7710a0e4b27807e824;hpb=cad27e97e6370f96903d42aaf345c099af0a03bd;p=libucw.git

diff --git a/lib/url.c b/lib/url.c
index f805e32f..d5cbcea2 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -2,7 +2,7 @@
  *	UCW Library -- URL Functions
  *
  *	(c) 1997--2004 Martin Mares <mj@ucw.cz>
- *	(c) 2001 Robert Spalek <robert@ucw.cz>
+ *	(c) 2001--2005 Robert Spalek <robert@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
@@ -149,6 +149,29 @@ url_enescape(byte *s, byte *d)
   return 0;
 }
 
+int
+url_enescape_friendly(byte *src, byte *dest)
+{
+  byte *end = dest + MAX_URL_SIZE - 10;
+  while (*src)
+    {
+      if (dest >= end)
+	return URL_ERR_TOO_LONG;
+      if (*src < NCC_MAX)
+	*dest++ = NCC_CHARS[*src++];
+      else if (*src >= 0x20 && *src < 0x7f)
+	*dest++ = *src++;
+      else
+	{
+	  *dest++ = '%';
+	  *dest++ = enhex(*src >> 4);
+	  *dest++ = enhex(*src++ & 0x0f);
+	}
+    }
+  *dest = 0;
+  return 0;
+}
+
 /* Split an URL (several parts may be copied to the destination buffer) */
 
 byte *url_proto_names[URL_PROTO_MAX] = URL_PNAMES;
@@ -201,18 +224,28 @@ url_split(byte *s, struct url *u, byte *d)
     {
       if (s[1] == '/')			/* Host spec */
 	{
-	  byte *q, *w, *e;
+	  byte *q, *e;
+	  byte *at = NULL;
 	  char *ep;
 
 	  s += 2;
 	  q = d;
 	  while (*s && *s != '/' && *s != '?')	/* Copy user:passwd@host:port */
-	    *d++ = *s++;
+	    {
+	      if (*s != '@')
+		*d++ = *s;
+	      else if (!at)
+		{
+		  *d++ = 0;
+		  at = d;
+		}
+	      else			/* This shouldn't happen with sane URL's, but we need to be sure */
+		*d++ = NCC_AT;
+	      s++;
+	    }
 	  *d++ = 0;
-	  w = strchr(q, '@');
-	  if (w)			/* user:passwd present */
+	  if (at)			/* user:passwd present */
 	    {
-	      *w++ = 0;
 	      u->user = q;
 	      if (e = strchr(q, ':'))
 		{
@@ -221,8 +254,8 @@ url_split(byte *s, struct url *u, byte *d)
 		}
 	    }
 	  else
-	    w = q;
-	  e = strchr(w, ':');
+	    at = q;
+	  e = strchr(at, ':');
 	  if (e)			/* host:port present */
 	    {
 	      uns p;
@@ -233,7 +266,7 @@ url_split(byte *s, struct url *u, byte *d)
 	      else if (p)		/* Port 0 (e.g. in :/) is treated as default port */
 		u->port = p;
 	    }
-	  u->host = w;
+	  u->host = at;
 	}
     }