* concat.cc (concat): canonicalize x:// to x:/ (exception to ://

meaning an url)

diff --git a/ChangeLog b/ChangeLog
index 7ff05b35b2799a43075bd3cf8f0e9c58baf1e84d..06a764a6ae75e1e4002a908a2986b6fad8ba16be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-02  DJ Delorie  <dj@redhat.com>
+
+       * concat.cc (concat): canonicalize x:// to x:/ (exception to ://
+       meaning an url)
+
 2000-08-02  Norman Vine <nhv@yahoo,com>
 
        * msg.cc (mbox): added MB_TOPMOST to MessageBox type flags

diff --git a/concat.cc b/concat.cc
index 217dc94f86b9543f463999a17eba775850444a78..84239511636fc063c81dab585a2ee72ed0ac9ded 100644 (file)
--- a/concat.cc
+++ b/concat.cc
@@ -64,7 +64,7 @@ concat (char *s, ...)
     {
       *d++ = *s;
       /* special case for URLs */
-      if (*s == ':' && s[1] == '/' &&s[2] == '/')
+      if (*s == ':' && s[1] == '/' && s[2] == '/' && s > rv+1)
        {
          *d++ = *++s;
          *d++ = *++s;