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

Return to sftp.c CVS log

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

Diff for /src/usr.bin/ssh/sftp.c between version 1.63.2.1 and 1.63.2.2

version 1.63.2.1, 2005/09/04 18:40:06

version 1.63.2.2, 2006/02/03 02:53:45

Line 692

}

if (lflag & SORT_FLAGS) {

for (n = 0; d[n] != NULL; n++)

; /* count entries */

sort_flag = lflag & (SORT_FLAGS|LS_REVERSE_SORT);

qsort(d, n, sizeof(*d), sdirent_comp);

}

Line 1428

Line 1430

extern int optind;

extern char *optarg;

/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */

sanitise_stdfd();

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

args.list = NULL;

addargs(&args, "ssh"); /* overwritten with ssh_program */

addargs(&args, ssh_program);

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

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

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

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

ll = SYSLOG_LEVEL_INFO;

Line 1463

Line 1470

break;

case 'S':

ssh_program = optarg;

replacearg(&args, 0, "%s", ssh_program);

break;

case 'b':

if (batchmode)

Line 1539

Line 1547

addargs(&args, "%s", host);

addargs(&args, "%s", (sftp_server != NULL ?

sftp_server : "sftp"));

args.list[0] = ssh_program;

if (!batchmode)

fprintf(stderr, "Connecting to %s...\n", host);

Line 1552

Line 1559

fprintf(stderr, "Attaching to %s...\n", sftp_direct);

connect_to_server(sftp_direct, args.list, &in, &out);

}

freeargs(&args);

err = interactive_loop(in, out, file1, file2);