diff options
author | Colin Watson <cjwatson@debian.org> | 2019-06-05 06:41:44 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2019-06-09 22:09:07 +0100 |
commit | 865a97e05b6aab1619e1c8eeb33ccb8f9a9e48d3 (patch) | |
tree | 7bb2128eb663180bacfabca88f26d26bf0733824 /scp.c | |
parent | ba627ba172d6649919baedff5ba2789610da382a (diff) | |
parent | 7d50f9e5be88179325983a1f58c9d51bb58f025a (diff) |
New upstream release (8.0p1)
Diffstat (limited to 'scp.c')
-rw-r--r-- | scp.c | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */ | 1 | /* $OpenBSD: scp.c,v 1.204 2019/02/10 11:15:52 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * scp - secure remote copy. This is basically patched BSD rcp which | 3 | * scp - secure remote copy. This is basically patched BSD rcp which |
4 | * uses ssh to do the data transfer (instead of using rcmd). | 4 | * uses ssh to do the data transfer (instead of using rcmd). |
@@ -409,6 +409,8 @@ main(int argc, char **argv) | |||
409 | /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ | 409 | /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ |
410 | sanitise_stdfd(); | 410 | sanitise_stdfd(); |
411 | 411 | ||
412 | seed_rng(); | ||
413 | |||
412 | msetlocale(); | 414 | msetlocale(); |
413 | 415 | ||
414 | /* Copy argv, because we modify it */ | 416 | /* Copy argv, because we modify it */ |
@@ -432,7 +434,7 @@ main(int argc, char **argv) | |||
432 | 434 | ||
433 | fflag = Tflag = tflag = 0; | 435 | fflag = Tflag = tflag = 0; |
434 | while ((ch = getopt(argc, argv, | 436 | while ((ch = getopt(argc, argv, |
435 | "dfl:prtTvBCc:i:P:q12346S:o:F:")) != -1) { | 437 | "dfl:prtTvBCc:i:P:q12346S:o:F:J:")) != -1) { |
436 | switch (ch) { | 438 | switch (ch) { |
437 | /* User-visible flags. */ | 439 | /* User-visible flags. */ |
438 | case '1': | 440 | case '1': |
@@ -454,6 +456,7 @@ main(int argc, char **argv) | |||
454 | case 'c': | 456 | case 'c': |
455 | case 'i': | 457 | case 'i': |
456 | case 'F': | 458 | case 'F': |
459 | case 'J': | ||
457 | addargs(&remote_remote_args, "-%c", ch); | 460 | addargs(&remote_remote_args, "-%c", ch); |
458 | addargs(&remote_remote_args, "%s", optarg); | 461 | addargs(&remote_remote_args, "%s", optarg); |
459 | addargs(&args, "-%c", ch); | 462 | addargs(&args, "-%c", ch); |
@@ -1604,8 +1607,9 @@ void | |||
1604 | usage(void) | 1607 | usage(void) |
1605 | { | 1608 | { |
1606 | (void) fprintf(stderr, | 1609 | (void) fprintf(stderr, |
1607 | "usage: scp [-346BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file]\n" | 1610 | "usage: scp [-346BCpqrTv] [-c cipher] [-F ssh_config] [-i identity_file]\n" |
1608 | " [-l limit] [-o ssh_option] [-P port] [-S program] source ... target\n"); | 1611 | " [-J destination] [-l limit] [-o ssh_option] [-P port]\n" |
1612 | " [-S program] source ... target\n"); | ||
1609 | exit(1); | 1613 | exit(1); |
1610 | } | 1614 | } |
1611 | 1615 | ||