Differences From Artifact [dffa508aab]:

• File pscp.c — part of check-in [3f40f538fa] at 2006-08-26 05:17:39 on branch trunk — On cleanup, PSCP and PSFTP should explicitly check that the back end is still running rather than relying on ssh_sftp_loop_iteration() to return a bogus value. (user: simon size: 58624)

To Artifact [5aa95f8cf1]:

• File pscp.c — part of check-in [32affe9699] at 2006-08-27 03:03:19 on branch trunk — The `socket' function in the backends is only ever checked to see if it's NULL. Since we already have one back end (uxpty) which doesn't in fact talk to a network socket, and may well have more soon, I'm replacing this TCP/IP-centric function with a nice neutral `connected' function returning a boolean. Nothing else about its semantics has currently changed. (user: simon size: 58614)

288
289
290
291
292
293
294
295

296
297
298
299
300
301
302

288
289
290
291
292
293
294

295
296
297
298
299
300
301
302

-
+

    va_end(ap);
    str2 = dupcat(str, "\n", NULL);
    sfree(str);
    tell_str(stderr, str2);
    sfree(str2);
    errs++;

    if (back != NULL && back->socket(backhandle) != NULL) {
    if (back != NULL && back->connected(backhandle)) {
	char ch;
	back->special(backhandle, TS_EOF);
	ssh_scp_recv((unsigned char *) &ch, 1);
    }

    cleanup_exit(1);
}

2281
2282
2283
2284
2285
2286
2287
2288

2289
2290
2291
2292
2293
2294
2295

2281
2282
2283
2284
2285
2286
2287

2288
2289
2290
2291
2292
2293
2294
2295

-
+

	if (colon(argv[argc - 1]) != NULL)
	    toremote(argc, argv);
	else
	    tolocal(argc, argv);
    }

    if (back != NULL && back->socket(backhandle) != NULL) {
    if (back != NULL && back->connected(backhandle)) {
	char ch;
	back->special(backhandle, TS_EOF);
	ssh_scp_recv((unsigned char *) &ch, 1);
    }
    random_save_seed();

    cmdline_cleanup();