From 9463774dee55bf3d8ab4d5dc8ac68816511aa684 Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Tue, 27 Mar 2012 14:32:20 +0200 Subject: [PATCH] Removed ignored -verbose (and -noverbose) options to mhstore. (In contrast to nmh, we also change the code.) Pulled in from nmh. Thanks to David Levine. --- man/mh-chart.man1 | 1 - man/mhstore.man1 | 6 ++---- uip/mhstore.c | 31 ++++++++----------------------- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/man/mh-chart.man1 b/man/mh-chart.man1 index ef5a939..9738de9 100644 --- a/man/mh-chart.man1 +++ b/man/mh-chart.man1 @@ -309,7 +309,6 @@ is equivalent to .IR content ] \&... .RB [ \-auto " | " \-noauto ] -.RB [ \-verbose " | " \-noverbose ] .RB [ \-rcache .IR policy ] .RB [ \-wcache diff --git a/man/mhstore.man1 b/man/mhstore.man1 index 395b76a..5ad0137 100644 --- a/man/mhstore.man1 +++ b/man/mhstore.man1 @@ -19,7 +19,6 @@ mhstore \- store contents of MIME messages into files .IR content ] \&... .RB [ \-auto " | " \-noauto ] -.RB [ \-verbose " | " \-noverbose ] .RB [ \-rcache .IR policy ] .RB [ \-wcache @@ -293,7 +292,7 @@ message in the following fashion: 8 message/partial 18K part 4 of 4 % mhstore 5-8 reassembling partials 5,6,7,8 to folder inbox as message 9 -% mhlist -verbose 9 +% mhlist 9 msg part type/subtype size description 9 application/octet-stream 118K (extract with uncompress | tar xvpf -) @@ -330,7 +329,7 @@ will automatically do the extraction for you: 8 message/partial 18K part 4 of 4 % mhstore 5-8 reassembling partials 5,6,7,8 to folder inbox as message 9 -% mhlist -verbose 9 +% mhlist 9 msg part type/subtype size description 9 application/octet-stream 118K (extract with uncompress | tar xvpf -) @@ -506,7 +505,6 @@ mhbuild(1), mhlist(1), mhshow(1), sendfiles(1) .RB ` \-nocheck ' .RB ` \-rcache ask ' .RB ` \-wcache ask ' -.RB ` \-noverbose ' .SH CONTEXT If a folder is given, it will become the current folder. The last diff --git a/uip/mhstore.c b/uip/mhstore.c index e510d13..764237e 100644 --- a/uip/mhstore.c +++ b/uip/mhstore.c @@ -28,29 +28,21 @@ static struct swit switches[] = { { "check", 0 }, #define NCHECKSW 3 { "nocheck", 0 }, -#define VERBSW 4 - { "verbose", 0 }, -#define NVERBSW 5 - { "noverbose", 0 }, -#define FILESW 6 /* interface from show */ +#define FILESW 4 /* interface from show */ { "file file", 0 }, -#define PARTSW 7 +#define PARTSW 5 { "part number", 0 }, -#define TYPESW 8 +#define TYPESW 6 { "type content", 0 }, -#define RCACHESW 9 +#define RCACHESW 7 { "rcache policy", 0 }, -#define WCACHESW 10 +#define WCACHESW 8 { "wcache policy", 0 }, -#define VERSIONSW 11 +#define VERSIONSW 9 { "version", 0 }, -#define HELPSW 12 +#define HELPSW 10 { "help", 0 }, - -/* -** switches for debugging -*/ -#define DEBUGSW 13 +#define DEBUGSW 11 { "debug", -5 }, { NULL, 0 } }; @@ -73,7 +65,6 @@ extern char *types[NTYPES + 1]; extern int userrs; int debugsw = 0; -int verbosw = 0; #define quitser pipeser @@ -249,12 +240,6 @@ do_cache: file = *cp == '-' ? cp : getcpy(expanddir(cp)); continue; - case VERBSW: - verbosw = 1; - continue; - case NVERBSW: - verbosw = 0; - continue; case DEBUGSW: debugsw = 1; continue; -- 1.7.10.4