diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1998-09-19 20:12:32 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1998-09-19 20:12:32 +0000 |
| commit | b88c954ff781fe3faae4f43443eb770a00e80b28 (patch) | |
| tree | 30290d6b41c01a4f0d02492e3c5bc7303ccc88dc /usr.bin | |
| parent | 6ab4816ceb9fa3798ee5c9a07573372967eeea00 (diff) | |
add -m option to turn on progress meter in non-verbose mode
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ftp/ftp.1 | 7 | ||||
| -rw-r--r-- | usr.bin/ftp/main.c | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1 index 5fe9ade4b64..c89ce7b9c1a 100644 --- a/usr.bin/ftp/ftp.1 +++ b/usr.bin/ftp/ftp.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ftp.1,v 1.19 1998/06/12 12:12:52 d Exp $ +.\" $OpenBSD: ftp.1,v 1.20 1998/09/19 20:12:31 millert Exp $ .\" $NetBSD: ftp.1,v 1.22 1997/08/18 10:20:22 lukem Exp $ .\" .\" Copyright (c) 1985, 1989, 1990, 1993 @@ -50,6 +50,7 @@ file transfer program .Op Fl e .Op Fl g .Op Fl i +.Op Fl m .Op Fl n .Op Fl o Ar output .Op Fl p @@ -103,6 +104,10 @@ Disables file name globbing. .It Fl i Turns off interactive prompting during multiple file transfers. +.It Fl m +Causes +.Nm +to display the progress meter even if in non-verbose mode. .It Fl n Restrains .Nm diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c index a6315217329..b66ca977b06 100644 --- a/usr.bin/ftp/main.c +++ b/usr.bin/ftp/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.40 1998/06/08 16:55:58 millert Exp $ */ +/* $OpenBSD: main.c,v 1.41 1998/09/19 20:12:31 millert Exp $ */ /* $NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 10/9/94"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.40 1998/06/08 16:55:58 millert Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.41 1998/09/19 20:12:31 millert Exp $"; #endif #endif /* not lint */ @@ -171,7 +171,7 @@ main(argc, argv) if (isatty(fileno(ttyout)) && !dumb_terminal && foregroundproc()) progress = 1; /* progress bar on if tty is usable */ - while ((ch = getopt(argc, argv, "Aadegino:pP:r:tvV")) != -1) { + while ((ch = getopt(argc, argv, "Aadegimno:pP:r:tvV")) != -1) { switch (ch) { case 'A': activefallback = 0; @@ -201,6 +201,10 @@ main(argc, argv) interactive = 0; break; + case 'm': + progress = 1; + break; + case 'n': autologin = 0; break; |