summaryrefslogtreecommitdiff
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();
OpenBSD-Commit-ID: 5b00e8db37c2b0a54c7831fed9e5f4db53ada332
-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 146d706d8..e48158b56 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.129 2020/04/03 04:34:15 djm Exp $ 1.\" $OpenBSD: sftp.1,v 1.130 2020/04/03 05:53:52 jmc Exp $
2.\" 2.\"
3.\" Copyright (c) 2001 Damien Miller. All rights reserved. 3.\" Copyright (c) 2001 Damien Miller. All rights reserved.
4.\" 4.\"
@@ -197,6 +197,10 @@ This option is directly passed to
197.Xr ssh 1 . 197.Xr ssh 1 .
198.It Fl l Ar limit 198.It Fl l Ar limit
199Limits the used bandwidth, specified in Kbit/s. 199Limits the used bandwidth, specified in Kbit/s.
200.It Fl N
201Disables quiet mode, e.g. to override the implicit quiet mode set by the
202.Fl b
203flag.
200.It Fl o Ar ssh_option 204.It Fl o Ar ssh_option
201Can be used to pass options to 205Can be used to pass options to
202.Nm ssh 206.Nm ssh
@@ -275,10 +279,6 @@ For full details of the options listed below, and their possible values, see
275.El 279.El
276.It Fl P Ar port 280.It Fl P Ar port
277Specifies the port to connect to on the remote host. 281Specifies the port to connect to on the remote host.
278.It Fl N
279Disables quiet mode, e.g. to override the implicit quiet mode set by the
280.Fl b
281flag.
282.It Fl p 282.It Fl p
283Preserves modification times, access times, and modes from the 283Preserves modification times, access times, and modes from the
284original files transferred. 284original files transferred.
diff --git a/sftp.c b/sftp.c
index 2cef84db7..2799e4a10 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.199 2020/04/03 04:34:15 djm Exp $ */ 1/* $OpenBSD: sftp.c,v 1.200 2020/04/03 05:53:52 jmc Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -2363,7 +2363,7 @@ usage(void)
2363 extern char *__progname; 2363 extern char *__progname;
2364 2364
2365 fprintf(stderr, 2365 fprintf(stderr,
2366 "usage: %s [-46aCfpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n" 2366 "usage: %s [-46aCfNpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n"
2367 " [-D sftp_server_path] [-F ssh_config] [-i identity_file]\n" 2367 " [-D sftp_server_path] [-F ssh_config] [-i identity_file]\n"
2368 " [-J destination] [-l limit] [-o ssh_option] [-P port]\n" 2368 " [-J destination] [-l limit] [-o ssh_option] [-P port]\n"
2369 " [-R num_requests] [-S program] [-s subsystem | sftp_server]\n" 2369 " [-R num_requests] [-S program] [-s subsystem | sftp_server]\n"