From: DJ Delorie <dj@redhat.com>
Date: Wed, 2 Aug 2000 20:19:04 +0000 (+0000)
Subject: * concat.cc (concat): canonicalize x:// to x:/ (exception to ://
X-Git-Tag: cygwin-1-1-5~33
X-Git-Url: https://cygwin.com/git/?a=commitdiff_plain;h=f5d0464b046c3036f239d32b507979a6443ad0a6;p=cygwin-apps%2Fsetup.git

* concat.cc (concat): canonicalize x:// to x:/ (exception to ://
meaning an url)
---

diff --git a/ChangeLog b/ChangeLog
index 7ff05b35..06a764a6 100644
--- 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 217dc94f..84239511 100644
--- 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;