diff options
author | tb@openbsd.org <tb@openbsd.org> | 2019-01-21 22:50:42 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-01-22 22:42:01 +1100 |
commit | 622dedf1a884f2927a9121e672bd9955e12ba108 (patch) | |
tree | de34eb30dd40556cf73ed5e6e6ef3b8c945436b0 /scp.c | |
parent | c882d74652800150d538e22c80dd2bd3cdd5fae2 (diff) | |
download | openssh-git-622dedf1a884f2927a9121e672bd9955e12ba108.tar.gz |
upstream: Add a -J option as a shortcut for -o Proxyjump= to scp(1)
and sftp(1) to match ssh(1)'s interface.
ok djm
OpenBSD-Commit-ID: a75bc2d5f329caa7229a7e9fe346c4f41c2663fc
Diffstat (limited to 'scp.c')
-rw-r--r-- | scp.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: scp.c,v 1.198 2018/11/16 03:03:10 djm Exp $ */ +/* $OpenBSD: scp.c,v 1.199 2019/01/21 22:50:42 tb Exp $ */ /* * scp - secure remote copy. This is basically patched BSD rcp which * uses ssh to do the data transfer (instead of using rcmd). @@ -424,7 +424,7 @@ main(int argc, char **argv) addargs(&args, "-oRequestTTY=no"); fflag = tflag = 0; - while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q12346S:o:F:")) != -1) + while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q12346S:o:F:J:")) != -1) switch (ch) { /* User-visible flags. */ case '1': @@ -446,6 +446,7 @@ main(int argc, char **argv) case 'c': case 'i': case 'F': + case 'J': addargs(&remote_remote_args, "-%c", ch); addargs(&remote_remote_args, "%s", optarg); addargs(&args, "-%c", ch); @@ -1319,7 +1320,8 @@ usage(void) { (void) fprintf(stderr, "usage: scp [-346BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file]\n" - " [-l limit] [-o ssh_option] [-P port] [-S program] source ... target\n"); + " [-J destination] [-l limit] [-o ssh_option] [-P port]\n" + " [-S program] source ... target\n"); exit(1); } |