upstream: sort -N and add it to usage();

OpenBSD-Commit-ID: 5b00e8db37c2b0a54c7831fed9e5f4db53ada332
This commit is contained in:
jmc@openbsd.org 2020-04-03 05:53:52 +00:00 committed by Damien Miller
parent 338ccee1e7
commit 668cb3585c
2 changed files with 7 additions and 7 deletions

10
sftp.1
View File

@ -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. .\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\" .\"
@ -197,6 +197,10 @@ This option is directly passed to
.Xr ssh 1 . .Xr ssh 1 .
.It Fl l Ar limit .It Fl l Ar limit
Limits the used bandwidth, specified in Kbit/s. 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 .It Fl o Ar ssh_option
Can be used to pass options to Can be used to pass options to
.Nm ssh .Nm ssh
@ -275,10 +279,6 @@ For full details of the options listed below, and their possible values, see
.El .El
.It Fl P Ar port .It Fl P Ar port
Specifies the port to connect to on the remote host. 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 .It Fl p
Preserves modification times, access times, and modes from the Preserves modification times, access times, and modes from the
original files transferred. original files transferred.

4
sftp.c
View File

@ -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> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -2363,7 +2363,7 @@ usage(void)
extern char *__progname; extern char *__progname;
fprintf(stderr, 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" " [-D sftp_server_path] [-F ssh_config] [-i identity_file]\n"
" [-J destination] [-l limit] [-o ssh_option] [-P port]\n" " [-J destination] [-l limit] [-o ssh_option] [-P port]\n"
" [-R num_requests] [-S program] [-s subsystem | sftp_server]\n" " [-R num_requests] [-S program] [-s subsystem | sftp_server]\n"