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

Return to scp.c CVS log

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

Diff for /src/usr.bin/ssh/scp.c between version 1.83 and 1.84

version 1.83, 2001/09/17 17:57:56

version 1.84, 2001/09/19 19:24:19

Line 223

addargs(&args, "-x");

addargs(&args, "-oForwardAgent no");

addargs(&args, "-oFallBackToRsh no");

addargs(&args, "-oClearAllForwardings yes");

fflag = tflag = 0;

while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:F:")) != -1)

Line 352

Line 353

for (i = 0; i < argc - 1; i++) {

src = colon(argv[i]);

if (src) { /* remote to remote */

static char *ssh_options =

"-x -o'FallBackToRsh no' "

"-o'ClearAllForwardings yes'";

*src++ = 0;

if (*src == 0)

src = ".";

host = strchr(argv[i], '@');

len = strlen(ssh_program) + strlen(argv[i]) +

strlen(src) + (tuser ? strlen(tuser) : 0) +

strlen(thost) + strlen(targ) + CMDNEEDS + 32;

strlen(thost) + strlen(targ) +

strlen(ssh_options) + CMDNEEDS + 20;

bp = xmalloc(len);

if (host) {

*host++ = 0;

Line 369

Line 374

else if (!okname(suser))

continue;

snprintf(bp, len,

"%s%s -x -o'FallBackToRsh no' -n "

"%s%s %s -n "

"-l %s %s %s %s '%s%s%s:%s'",

ssh_program, verbose_mode ? " -v" : "",

suser, host, cmd, src,

ssh_options, suser, host, cmd, src,

tuser ? tuser : "", tuser ? "@" : "",

thost, targ);

} else {

host = cleanhostname(argv[i]);

snprintf(bp, len,

"exec %s%s -x -o'FallBackToRsh no' -n %s "

"exec %s%s %s -n %s "

"%s %s '%s%s%s:%s'",

ssh_program, verbose_mode ? " -v" : "",

host, cmd, src,

ssh_options, host, cmd, src,

tuser ? tuser : "", tuser ? "@" : "",

thost, targ);

}