Changeset 5113:48625b8141d7

Timestamp:

2007-04-10 16:22:08 (21 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Simplify body cache path creation

Files:

• bcache.c (modified) (2 diffs)
• url.c (modified) (1 diff)
• url.h (modified) (1 diff)

bcache.c

@@ -58 +58 @@
    */
   url.path = NULL;
-  if (url_ciss_tostring (&url, host, sizeof (host), 0) < 0)
+  if (url_ciss_tostring (&url, host, sizeof (host), U_PATH) < 0)
   {
     dprint (1, (debugfile, "bcache_path: URL to string failed\n"));
@@ -65 +65 @@
 
   dprint (3, (debugfile, "bcache_path: URL: '%s'\n", host));
-
-  /* transform URL scheme:// to scheme: */
-  for (s = p = host; *s; s++)
-    /* keep trailing slash */
-    if (*s != '/' || *(s + 1) == '\0')
-      *p++ = *s;
-  *p = '\0';
 
   len = snprintf (dst, dstlen-1, "%s/%s%s%s", MessageCachedir,

url.c

@@ -185 +185 @@
   if (ciss->host)
   {
-    safe_strcat (dest, len, "//");
+    if (!(flags & U_PATH))
+      safe_strcat (dest, len, "//");
     len -= (l = strlen (dest)); dest += l;
     

url.h

@@ -17 +17 @@
 
 #define U_DECODE_PASSWD (1)
+#define U_PATH          (1 << 1)
 
 typedef struct ciss_url