src/usr.bin/ssh/scp.c - diff

Return to scp.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.140, 2006/04/01 05:42:20

version 1.141, 2006/04/01 05:50:29

Line 413

{

char *bp, *host, *src, *suser, *thost, *tuser, *arg;

arglist alist;

size_t len;

int i;

memset(&alist, '\0', sizeof(alist));

Line 479

Line 478

errs = 1;

} else { /* local to remote */

if (remin == -1) {

len = strlen(targ) + CMDNEEDS + 20;

xasprintf(&bp, "%s -t %s", cmd, targ);

bp = xmalloc(len);

(void) snprintf(bp, len, "%s -t %s", cmd, targ);

host = cleanhostname(thost);

if (do_cmd(host, tuser, bp, &remin,

&remout) < 0)

Line 500

Line 497

{

char *bp, *host, *src, *suser;

arglist alist;

size_t len;

int i;

memset(&alist, '\0', sizeof(alist));

Line 533

Line 529

suser = pwd->pw_name;

}

host = cleanhostname(host);

len = strlen(src) + CMDNEEDS + 20;

xasprintf(&bp, "%s -f %s", cmd, src);

bp = xmalloc(len);

(void) snprintf(bp, len, "%s -f %s", cmd, src);

if (do_cmd(host, suser, bp, &remin, &remout) < 0) {

(void) xfree(bp);

++errs;