summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2020-04-03 05:53:52 +0000
committerDamien Miller <djm@mindrot.org>2020-04-03 17:09:42 +1100
commit668cb3585ce829bd6e34d4a962c489bda1d16370 (patch)
tree3f6b7f592236fa2462b90cf79d85703d91923f0e
parent338ccee1e7fefa47f3d128c2541e94c5270abe0c (diff)
upstream: sort -N and add it to usage();
-rw-r--r--sftp.110
-rw-r--r--sftp.c4
2 files changed, 7 insertions, 7 deletions
diff --git a/sftp.1 b/sftp.1
index 146d706d..e48158b5 100644
--- a/sftp.1
+++ b/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/sftp.c b/sftp.c
index 2cef84db..2799e4a1 100644
--- a/sftp.c
+++ b/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>
*
@@ -2363,7 +2363,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"