Add the -m flag to the ftp.1 man page.

Adjust the usage message of ftp(1) to reflect its two operating modes
and list missing flags.

OK florian@ jmc@

diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index 8fa35e3..32d90c8 100644 (file)
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: ftp.1,v 1.113 2019/05/14 18:27:37 florian Exp $
+.\"    $OpenBSD: ftp.1,v 1.114 2019/05/15 11:53:22 kmos Exp $
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -43,7 +43,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 14 2019 $
+.Dd $Mdocdate: May 15 2019 $
 .Dt FTP 1
 .Os
 .Sh NAME
@@ -55,7 +55,7 @@
 .Op Fl D Ar title
 .Op Ar host Op Ar port
 .Nm
-.Op Fl 46ACMV
+.Op Fl 46ACMmVv
 .Op Fl D Ar title
 .Op Fl o Ar output
 .Op Fl S Ar tls_options
@@ -111,6 +111,10 @@ Specify a short title for the start of the progress bar.
 Causes
 .Nm
 to never display the progress meter in cases where it would do so by default.
+.It Fl m
+Causes
+.Nm
+to display the progress meter in cases where it would not do so by default.
 .It Fl o Ar output
 When fetching a file or URL, save the contents in
 .Ar output .

diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index a9f87f1..bae68f4 100644 (file)
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: main.c,v 1.126 2019/05/14 18:25:31 florian Exp $ */
+/*     $OpenBSD: main.c,v 1.127 2019/05/15 11:53:22 kmos Exp $ */
 
 /*
  * Copyright (c) 2015 Sunil Nimmagadda <sunil@openbsd.org>
@@ -412,9 +412,10 @@ proxy_parse(const char *name)
 static __dead void
 usage(void)
 {
-       fprintf(stderr, "usage: %s [-46ACVM] [-D title] [-o output] "
-           "[-S tls_options] [-U useragent] "
-           "[-w seconds] url ...\n", getprogname());
+       fprintf(stderr, "usage:\t%s [-46AVv] [-D title] [host [port]]\n"
+           "\t%s [-46ACMmVv] [-D title] [-o output] [-S tls_options]\n"
+           "\t\t[-U useragent] [-w seconds] url ...\n", getprogname(),
+            getprogname());
 
        exit(1);
 }