diff options
| author |   tedu <tedu@openbsd.org> | 2015-02-17 22:39:32 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2015-02-17 22:39:32 +0000 |
| commit | d2432b18a8709dd0f67201ce17e8780116c2b868 (patch) | |
| tree | b5df308ad7d2f3eaa157bdab780d2788967517cf | |
| parent | the rnd event ringbuf calculations aren't correct, which may result in (diff) | |
| download | wireguard-openbsd-d2432b18a8709dd0f67201ce17e8780116c2b868.tar.xz wireguard-openbsd-d2432b18a8709dd0f67201ce17e8780116c2b868.zip | |
add -M to disable progressmeter. ok dlg halex millert
| -rw-r--r-- | usr.bin/ftp/ftp.1 | 11 | ||||
| -rw-r--r-- | usr.bin/ftp/main.c | 9 |
2 files changed, 14 insertions, 6 deletions
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1 index e930b5076b2..2493952775a 100644 --- a/usr.bin/ftp/ftp.1 +++ b/usr.bin/ftp/ftp.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ftp.1,v 1.96 2015/01/31 19:33:45 jmc Exp $ +.\" $OpenBSD: ftp.1,v 1.97 2015/02/17 22:39:32 tedu Exp $ .\" $NetBSD: ftp.1,v 1.22 1997/08/18 10:20:22 lukem Exp $ .\" .\" Copyright (c) 1985, 1989, 1990, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)ftp.1 8.3 (Berkeley) 10/9/94 .\" -.Dd $Mdocdate: January 31 2015 $ +.Dd $Mdocdate: February 17 2015 $ .Dt FTP 1 .Os .Sh NAME @@ -38,7 +38,7 @@ .Nd Internet file transfer program .Sh SYNOPSIS .Nm ftp -.Op Fl 46AadEegimnptVv +.Op Fl 46AadEegiMmnptVv .Op Fl D Ar title .Op Fl k Ar seconds .Op Fl P Ar port @@ -181,6 +181,11 @@ transfer. By default, .Nm will send a byte every 60 seconds. +.It Fl M +Causes +.Nm +to never display the progress meter in cases where it would do +so by default. .It Fl m Causes .Nm diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c index 3cf7719a068..aa3e32ce663 100644 --- a/usr.bin/ftp/main.c +++ b/usr.bin/ftp/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.99 2015/02/13 08:41:34 sthen Exp $ */ +/* $OpenBSD: main.c,v 1.100 2015/02/17 22:39:32 tedu Exp $ */ /* $NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $ */ /* @@ -210,7 +210,7 @@ main(volatile int argc, char *argv[]) httpuseragent = NULL; while ((ch = getopt(argc, argv, - "46AaCc:dD:Eegik:mno:pP:r:S:s:tU:vV")) != -1) { + "46AaCc:dD:Eegik:Mmno:pP:r:S:s:tU:vV")) != -1) { switch (ch) { case '4': family = PF_INET; @@ -276,6 +276,9 @@ main(volatile int argc, char *argv[]) usage(); } break; + case 'M': + progress = 0; + break; case 'm': progress = -1; break; @@ -875,7 +878,7 @@ usage(void) { fprintf(stderr, "usage: " #ifndef SMALL - "%1$s [-46AadEegimnptVv] [-D title] [-k seconds] [-P port] " + "%1$s [-46AadEegiMmnptVv] [-D title] [-k seconds] [-P port] " "[-r seconds]\n" " [-s srcaddr] [host [port]]\n" " %1$s [-C] [-o output] [-s srcaddr]\n" |