Differences From Artifact [0b759298fc]:

• File pscp.c — part of check-in [fa1347493a] at 2005-10-30 14:24:09 on branch trunk — Revamp SSH authentication code so that user interaction is more abstracted out; replace loops structured around a single interaction per loop with less tortuous code (fixes: `ki-multiprompt-crash', `ssh1-bad-passphrase-crash'; makes `ssh2-password-expiry' and `proxy-password-prompt' easier). The new interaction abstraction has a lot of fields that are unused in the current code (things like window captions); this is groundwork for `gui-auth'. However, ssh.c still writes directly to stderr; that may want to be fixed. In the GUI apps, user interaction is moved to terminal.c. This should make it easier to fix things like UTF-8 username entry, although I haven't attempted to do so. Also, control character filtering can be tailored to be appropriate for individual front-ends; so far I don't promise anything other than not having made it any worse. I've tried to test this fairly exhaustively (although Mac stuff is untested, as usual). It all seems to basically work, but I bet there are new bugs. (One I know about is that you can no longer make the PuTTY window go away with a ^D at the password prompt; this should be fixed.) (user: jacob size: 58273)

To Artifact [acd4171235]:

• File pscp.c — part of check-in [5f8792b0e9] at 2006-02-11 13:10:01 on branch trunk — 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. (user: jacob size: 58214)

542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565


566
567









568

569
570
571
572
573
574
575

542
543
544
545
546
547
548













549
550
551

552
553
554

555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572

-
-
-
-
-
-
-
-
-
-
-
-
-



-
+
+

-
+
+
+
+
+
+
+
+
+

+

/*
 *  Find a colon in str and return a pointer to the colon.
 *  This is used to separate hostname from filename.
 */
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
	return (NULL);
}

/*