diff options
| author |   jmc <jmc@openbsd.org> | 2020-04-03 05:53:52 +0000 |
|---|---|---|
| committer | jmc <jmc@openbsd.org> | 2020-04-03 05:53:52 +0000 |
| commit | cb2743ae52a5355d3776f893e8f0af61b3f4cd7a (patch) | |
| tree | 1eaa5a7ed6a30541cd3028112c23800f24fbbd5b | |
| parent | avoid another compiler warning spotted in -portable (diff) | |
| download | wireguard-openbsd-cb2743ae52a5355d3776f893e8f0af61b3f4cd7a.tar.xz wireguard-openbsd-cb2743ae52a5355d3776f893e8f0af61b3f4cd7a.zip | |
sort -N and add it to usage();
| -rw-r--r-- | usr.bin/ssh/sftp.1 | 10 | ||||
| -rw-r--r-- | usr.bin/ssh/sftp.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/ssh/sftp.1 b/usr.bin/ssh/sftp.1 index 146d706d8af..e48158b568e 100644 --- a/usr.bin/ssh/sftp.1 +++ b/usr.bin/ssh/sftp.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sftp.1,v 1.129 2020/04/03 04:34:15 djm Exp $ +.\" $OpenBSD: sftp.1,v 1.130 2020/04/03 05:53:52 jmc Exp $ .\" .\" Copyright (c) 2001 Damien Miller. All rights reserved. .\" @@ -197,6 +197,10 @@ This option is directly passed to .Xr ssh 1 . .It Fl l Ar limit Limits the used bandwidth, specified in Kbit/s. +.It Fl N +Disables quiet mode, e.g. to override the implicit quiet mode set by the +.Fl b +flag. .It Fl o Ar ssh_option Can be used to pass options to .Nm ssh @@ -275,10 +279,6 @@ For full details of the options listed below, and their possible values, see .El .It Fl P Ar port Specifies the port to connect to on the remote host. -.It Fl N -Disables quiet mode, e.g. to override the implicit quiet mode set by the -.Fl b -flag. .It Fl p Preserves modification times, access times, and modes from the original files transferred. diff --git a/usr.bin/ssh/sftp.c b/usr.bin/ssh/sftp.c index d05c0ba96f0..becdb9311d3 100644 --- a/usr.bin/ssh/sftp.c +++ b/usr.bin/ssh/sftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.199 2020/04/03 04:34:15 djm Exp $ */ +/* $OpenBSD: sftp.c,v 1.200 2020/04/03 05:53:52 jmc Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -2316,7 +2316,7 @@ usage(void) extern char *__progname; fprintf(stderr, - "usage: %s [-46aCfpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n" + "usage: %s [-46aCfNpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n" " [-D sftp_server_path] [-F ssh_config] [-i identity_file]\n" " [-J destination] [-l limit] [-o ssh_option] [-P port]\n" " [-R num_requests] [-S program] [-s subsystem | sftp_server]\n" |