View | Details | Raw Unified | Return to bug 1371 | Differences between
and this patch

Collapse All | Expand All

(-)openssh-5.0p1/scp.c (-1 / +7 lines)
Lines 323-331 main(int argc, char **argv) Link Here
323
	addargs(&args, "-oClearAllForwardings yes");
323
	addargs(&args, "-oClearAllForwardings yes");
324
324
325
	fflag = tflag = 0;
325
	fflag = tflag = 0;
326
	while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246S:o:F:")) != -1)
326
	while ((ch = getopt(argc, argv, "#:dfl:prtvBCc:i:P:q1246S:o:F:")) != -1)
327
		switch (ch) {
327
		switch (ch) {
328
		/* User-visible flags. */
328
		/* User-visible flags. */
329
		case '#':
330
			addargs(&args, "-#%s", optarg);
331
			break;
329
		case '1':
332
		case '1':
330
		case '2':
333
		case '2':
331
		case '4':
334
		case '4':
Lines 1169-1174 usage(void) Link Here
1169
	(void) fprintf(stderr,
1172
	(void) fprintf(stderr,
1170
	    "usage: scp [-1246BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file]\n"
1173
	    "usage: scp [-1246BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file]\n"
1171
	    "           [-l limit] [-o ssh_option] [-P port] [-S program]\n"
1174
	    "           [-l limit] [-o ssh_option] [-P port] [-S program]\n"
1175
#ifdef ENABLE_PKCS11
1176
	    "           [-# pkcs11_provider_info]\n"
1177
#endif
1172
	    "           [[user@]host1:]file1 ... [[user@]host2:]file2\n");
1178
	    "           [[user@]host1:]file1 ... [[user@]host2:]file2\n");
1173
	exit(1);
1179
	exit(1);
1174
}
1180
}

Return to bug 1371