From: jacob <jacob@cda61777-01e9-0310-a592-d414129be87e>
Date: Sat, 11 Feb 2006 19:10:01 +0000 (+0000)
Subject: Don Heap spotted that our heuristics for dealing with IPv6 literal addresses
X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/commitdiff_plain/6437dc6b0d16f23b8dfe7a97a6c67ff277eebc83

Don Heap spotted that our heuristics for dealing with IPv6 literal addresses
in the PSCP command line were bogus, giving "remote to remote not supported"
errors with filenames like '[].txt'. Made the heuristic less bogus.


git-svn-id: svn://svn.tartarus.org/sgt/putty@6551 cda61777-01e9-0310-a592-d414129be87e
---

diff --git a/pscp.c b/pscp.c
index 575025f2..b67782eb 100644
--- a/pscp.c
+++ b/pscp.c
@@ -546,26 +546,23 @@ static void print_stats(char *name, unsigned long size, unsigned long done,
  */
 static char *colon(char *str)
 {
-    /* Check and process IPv6 literal addresses
-     * (eg: 'jeroen@[2001:db8::1]:myfile.txt') */
-    char *ipv6 = strchr(str, '[');
-    if (ipv6) {
-	str = strchr(str, ']');
-	if (str) {
-	    /* Terminate on the closing bracket */
-	    *str++ = '\0';
-	    return (str);
-	}
-	return (NULL);
-    }
-
     /* We ignore a leading colon, since the hostname cannot be
        empty. We also ignore a colon as second character because
        of filenames like f:myfile.txt. */
-    if (str[0] == '\0' || str[0] == ':' || str[1] == ':')
+    if (str[0] == '\0' || str[0] == ':' ||
+        (str[0] != '[' && str[1] == ':'))
 	return (NULL);
-    while (*str != '\0' && *str != ':' && *str != '/' && *str != '\\')
+    while (*str != '\0' && *str != ':' && *str != '/' && *str != '\\') {
+	if (*str == '[') {
+	    /* Skip over IPv6 literal addresses
+	     * (eg: 'jeroen@[2001:db8::1]:myfile.txt') */
+	    char *ipv6_end = strchr(str, ']');
+	    if (ipv6_end) {
+		str = ipv6_end;
+	    }
+	}
 	str++;
+    }
     if (*str == ':')
 	return (str);
     else