From: Dan Harkless Date: Fri, 4 Feb 2000 20:28:23 +0000 (+0000) Subject: Whoever originally added the -help switch to all the commands got too cute and X-Git-Tag: nmh-1_0~81 X-Git-Url: http://git.marmaro.de/?p=mmh;a=commitdiff_plain;h=017a82124bf2ea39ced5aa4c8f969c18b3c2fb90 Whoever originally added the -help switch to all the commands got too cute and had the option itself print out as "-(help)" in the -help output. I guess the idea was to make reference to the fact that clearly you know about the -help option since you're currently looking at its output. I think it's a bad idea to overload the meaning of the parentheses, however -- they're supposed to indicate what abbreviated prefix of the switch you're allowed to specify. It doesn't make sense to show that you're allowed to "abbreviate" the switch to its entire length. --- diff --git a/uip/ali.c b/uip/ali.c index d03d717..5b38b83 100644 --- a/uip/ali.c +++ b/uip/ali.c @@ -35,7 +35,7 @@ static struct swit switches[] = { #define VERSIONSW 8 { "version", 0 }, #define HELPSW 9 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/anno.c b/uip/anno.c index 34cd5da..bf0e9ca 100644 --- a/uip/anno.c +++ b/uip/anno.c @@ -30,7 +30,7 @@ static struct swit switches[] = { #define VERSIONSW 6 { "version", 0 }, #define HELPSW 7 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/ap.c b/uip/ap.c index 2abba4b..dde1175 100644 --- a/uip/ap.c +++ b/uip/ap.c @@ -31,7 +31,7 @@ static struct swit switches[] = { #define VERSIONSW 5 { "version", 0 }, #define HELPSW 6 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/burst.c b/uip/burst.c index d367b97..4f654fb 100644 --- a/uip/burst.c +++ b/uip/burst.c @@ -23,7 +23,7 @@ static struct swit switches[] = { #define VERSIONSW 6 { "version", 0 }, #define HELPSW 7 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/comp.c b/uip/comp.c index d380b52..7e74138 100644 --- a/uip/comp.c +++ b/uip/comp.c @@ -34,7 +34,7 @@ static struct swit switches[] = { #define VERSIONSW 11 { "version", 0 }, #define HELPSW 12 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/conflict.c b/uip/conflict.c index 1a921cd..cac0ea8 100644 --- a/uip/conflict.c +++ b/uip/conflict.c @@ -31,7 +31,7 @@ static struct swit switches[] = { #define VERSIONSW 2 { "version", 0 }, #define HELPSW 3 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/dist.c b/uip/dist.c index f8769a0..58ca45e 100644 --- a/uip/dist.c +++ b/uip/dist.c @@ -36,7 +36,7 @@ static struct swit switches[] = { #define VERSIONSW 12 { "version", 0 }, #define HELPSW 13 - { "help", 4 }, + { "help", 0 }, #define FILESW 14 { "file file", -4 }, /* interface from msh */ { NULL, 0 } diff --git a/uip/dp.c b/uip/dp.c index a9bc90f..ab44141 100644 --- a/uip/dp.c +++ b/uip/dp.c @@ -26,7 +26,7 @@ static struct swit switches[] = { #define VERSIONSW 3 { "version", 0 }, #define HELPSW 4 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/flist.c b/uip/flist.c index ad0cf2d..dac84d5 100644 --- a/uip/flist.c +++ b/uip/flist.c @@ -58,7 +58,7 @@ static struct swit switches[] = { #define VERSIONSW 13 { "version", 0 }, #define HELPSW 14 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/fmtdump.c b/uip/fmtdump.c index 87e22bf..baab475 100644 --- a/uip/fmtdump.c +++ b/uip/fmtdump.c @@ -18,7 +18,7 @@ static struct swit switches[] = { #define VERSIONSW 2 { "version", 0 }, #define HELPSW 3 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/folder.c b/uip/folder.c index f940316..c16dd96 100644 --- a/uip/folder.c +++ b/uip/folder.c @@ -58,7 +58,7 @@ static struct swit switches[] = { #define VERSIONSW 22 { "version", 0 }, #define HELPSW 23 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/forw.c b/uip/forw.c index cff49c7..d8b17d3 100644 --- a/uip/forw.c +++ b/uip/forw.c @@ -62,7 +62,7 @@ static struct swit switches[] = { #define VERSIONSW 22 { "version", 0 }, #define HELPSW 23 - { "help", 4 }, + { "help", 0 }, #define FILESW 24 { "file file", 4 }, /* interface from msh */ diff --git a/uip/inc.c b/uip/inc.c index fd7b55e..f00c337 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -105,7 +105,7 @@ static struct swit switches[] = { #define VERSIONSW 20 { "version", 0 }, #define HELPSW 21 - { "help", 4 }, + { "help", 0 }, #define SNOOPSW 22 { "snoop", -5 }, #define KPOPSW 23 diff --git a/uip/install-mh.c b/uip/install-mh.c index b2a1f1d..7b2ef2a 100644 --- a/uip/install-mh.c +++ b/uip/install-mh.c @@ -14,7 +14,7 @@ static struct swit switches[] = { #define VERSIONSW 1 { "version", 0 }, #define HELPSW 2 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/mark.c b/uip/mark.c index 9bd4561..e53b3d5 100644 --- a/uip/mark.c +++ b/uip/mark.c @@ -36,7 +36,7 @@ static struct swit switches[] = { #define VERSIONSW 8 { "version", 0 }, #define HELPSW 9 - { "help", 4 }, + { "help", 0 }, #define DEBUGSW 10 { "debug", -5 }, { NULL, 0 } diff --git a/uip/mhbuild.c b/uip/mhbuild.c index dc0059c..2450572 100644 --- a/uip/mhbuild.c +++ b/uip/mhbuild.c @@ -57,7 +57,7 @@ static struct swit switches[] = { #define VERSIONSW 16 { "version", 0 }, #define HELPSW 17 - { "help", 4 }, + { "help", 0 }, #define DEBUGSW 18 { "debug", -5 }, { NULL, 0 } diff --git a/uip/mhlist.c b/uip/mhlist.c index ec2f945..bacaf24 100644 --- a/uip/mhlist.c +++ b/uip/mhlist.c @@ -58,7 +58,7 @@ static struct swit switches[] = { #define VERSIONSW 13 { "version", 0 }, #define HELPSW 14 - { "help", 4 }, + { "help", 0 }, /* * switches for debugging diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index 68d0835..882304c 100644 --- a/uip/mhlsbr.c +++ b/uip/mhlsbr.c @@ -72,7 +72,7 @@ static struct swit mhlswitches[] = { #define VERSIONSW 15 { "version", 0 }, #define HELPSW 16 - { "help", 4 }, + { "help", 0 }, #define FORW1SW 17 { "forward", -7 }, /* interface from forw */ #define FORW2SW 18 diff --git a/uip/mhmail.c b/uip/mhmail.c index 222a076..5171f4e 100644 --- a/uip/mhmail.c +++ b/uip/mhmail.c @@ -21,7 +21,7 @@ static struct swit switches[] = { #define VERSIONSW 4 { "version", 0 }, #define HELPSW 5 - { "help", 4 }, + { "help", 0 }, #define RESNDSW 6 { "resent", -6 }, #define QUEUESW 7 diff --git a/uip/mhn.c b/uip/mhn.c index f73853e..d4f462f 100644 --- a/uip/mhn.c +++ b/uip/mhn.c @@ -88,7 +88,7 @@ static struct swit switches[] = { #define VERSIONSW 28 { "version", 0 }, #define HELPSW 29 - { "help", 4 }, + { "help", 0 }, /* * switches for debugging diff --git a/uip/mhparam.c b/uip/mhparam.c index f6ebb65..ece8c3c 100644 --- a/uip/mhparam.c +++ b/uip/mhparam.c @@ -26,7 +26,7 @@ static struct swit switches[] = { #define VERSIONSW 3 { "version", 0 }, #define HELPSW 4 - { "help", 4 }, + { "help", 0 }, #define DEBUGSW 5 { "debug", -5 }, { NULL, 0 } diff --git a/uip/mhpath.c b/uip/mhpath.c index 918371a..5c2ac31 100644 --- a/uip/mhpath.c +++ b/uip/mhpath.c @@ -11,7 +11,7 @@ static struct swit switches[] = { #define VERSIONSW 0 { "version", 0 }, #define HELPSW 1 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/mhshow.c b/uip/mhshow.c index 0791c48..af42092 100644 --- a/uip/mhshow.c +++ b/uip/mhshow.c @@ -60,7 +60,7 @@ static struct swit switches[] = { #define VERSIONSW 14 { "version", 0 }, #define HELPSW 15 - { "help", 4 }, + { "help", 0 }, /* * switches for moreproc/mhlproc diff --git a/uip/mhstore.c b/uip/mhstore.c index c9b6a26..806a352 100644 --- a/uip/mhstore.c +++ b/uip/mhstore.c @@ -54,7 +54,7 @@ static struct swit switches[] = { #define VERSIONSW 11 { "version", 0 }, #define HELPSW 12 - { "help", 4 }, + { "help", 0 }, /* * switches for debugging diff --git a/uip/mhtest.c b/uip/mhtest.c index 5c03109..4bc9245 100644 --- a/uip/mhtest.c +++ b/uip/mhtest.c @@ -52,7 +52,7 @@ static struct swit switches[] = { #define VERSIONSW 10 { "version", 0 }, #define HELPSW 11 - { "help", 4 }, + { "help", 0 }, /* * switches for debugging diff --git a/uip/msgchk.c b/uip/msgchk.c index 23ede03..2553c49 100644 --- a/uip/msgchk.c +++ b/uip/msgchk.c @@ -66,7 +66,7 @@ static struct swit switches[] = { #define VERSIONSW 10 { "version", 0 }, #define HELPSW 11 - { "help", 4 }, + { "help", 0 }, #define SNOOPSW 12 { "snoop", -5 }, #define KPOPSW 13 diff --git a/uip/msh.c b/uip/msh.c index 41cf510..2769c24 100644 --- a/uip/msh.c +++ b/uip/msh.c @@ -67,7 +67,7 @@ static struct swit switches[] = { #define VERSIONSW 13 { "version", 0 }, #define HELPSW 14 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/mshcmds.c b/uip/mshcmds.c index 13ad356..b785aeb 100644 --- a/uip/mshcmds.c +++ b/uip/mshcmds.c @@ -139,7 +139,7 @@ static struct swit distswit[] = { #define DINWTSW 11 { "nowhatnowproc", 0 }, #define DIHELP 12 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -240,7 +240,7 @@ static struct swit explswit[] = { #define EXNVBSW 5 { "noverbose", 0 }, #define EXHELP 6 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -469,7 +469,7 @@ static struct swit fileswit[] = { #define FINPRC 8 { "normmproc", 0 }, #define FIHELP 9 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -633,7 +633,7 @@ static struct swit foldswit[] = { #define FLLISW 14 { "list", 0 }, #define FLHELP 15 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -852,7 +852,7 @@ static struct swit forwswit[] = { #define FONWTSW 16 { "nowhatnow", 0 }, #define FOHELP 17 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -1120,7 +1120,7 @@ static struct swit markswit[] = { #define MNZERSW 7 { "nozero", 0 }, #define MHELP 8 - { "help", 4 }, + { "help", 0 }, #define MDBUGSW 9 { "debug", -5 }, { NULL, 0 } @@ -1339,7 +1339,7 @@ static struct swit mhnswit[] = { #define MHNNVERBSW 23 { "noverbose", 0 }, #define MHNHELPSW 24 - { "help", 4 }, + { "help", 0 }, #define MHNPROGSW 25 { "moreproc program", -4 }, #define MHNNPROGSW 26 @@ -1454,7 +1454,7 @@ static struct swit packswit[] = { #define PAFISW 0 { "file name", 0 }, #define PAHELP 1 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -1632,7 +1632,7 @@ static struct swit pickswit[] = { #define PINLISW 21 { "nolist", 0 }, #define PIHELP 22 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -1819,7 +1819,7 @@ static struct swit replswit[] = { #define REWIDSW 19 { "width columns", 0 }, #define REHELP 20 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -1915,7 +1915,7 @@ replcmd (char **args) static struct swit rmmswit[] = { #define RMHELP 0 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -2044,7 +2044,7 @@ static struct swit scanswit[] = { #define SCWID 6 { "width columns", 0 }, #define SCHELP 7 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -2294,7 +2294,7 @@ static struct swit showswit[] = { #define SHNHEAD 9 { "noheader", 3 }, #define SHHELP 10 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -2726,7 +2726,7 @@ static struct swit sortswit[] = { #define SONVERB 6 { "noverbose", 0 }, #define SOHELP 7 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/packf.c b/uip/packf.c index a607da8..42e6694 100644 --- a/uip/packf.c +++ b/uip/packf.c @@ -27,7 +27,7 @@ static struct swit switches[] = { #define VERSIONSW 3 { "version", 0 }, #define HELPSW 4 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/pick.c b/uip/pick.c index fb34285..6cae130 100644 --- a/uip/pick.c +++ b/uip/pick.c @@ -64,7 +64,7 @@ static struct swit switches[] = { #define VERSIONSW 22 { "version", 0 }, #define HELPSW 23 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/popi.c b/uip/popi.c index a48c223..cb24930 100644 --- a/uip/popi.c +++ b/uip/popi.c @@ -65,7 +65,7 @@ static struct swit switches[] = { #define VERSIONSW 13 { "version", 0 }, #define HELPSW 14 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/prompter.c b/uip/prompter.c index e1f0e8d..79e0eb7 100644 --- a/uip/prompter.c +++ b/uip/prompter.c @@ -56,7 +56,7 @@ static struct swit switches[] = { #define VERSIONSW 10 { "version", 0 }, #define HELPSW 11 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/rcvdist.c b/uip/rcvdist.c index 5fca8ec..ace5295 100644 --- a/uip/rcvdist.c +++ b/uip/rcvdist.c @@ -17,7 +17,7 @@ static struct swit switches[] = { #define VERSIONSW 1 { "version", 0 }, #define HELPSW 2 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/rcvpack.c b/uip/rcvpack.c index f9834be..f5b1c05 100644 --- a/uip/rcvpack.c +++ b/uip/rcvpack.c @@ -19,7 +19,7 @@ static struct swit switches[] = { #define VERSIONSW 2 { "version", 0 }, #define HELPSW 3 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/rcvstore.c b/uip/rcvstore.c index 43d3889..bef959c 100644 --- a/uip/rcvstore.c +++ b/uip/rcvstore.c @@ -34,7 +34,7 @@ static struct swit switches[] = { #define VERSIONSW 9 { "version", 0 }, #define HELPSW 10 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/rcvtty.c b/uip/rcvtty.c index f922012..69a9031 100644 --- a/uip/rcvtty.c +++ b/uip/rcvtty.c @@ -48,7 +48,7 @@ static struct swit switches[] = { #define VERSIONSW 8 { "version", 0 }, #define HELPSW 9 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/refile.c b/uip/refile.c index 906ea4a..f484ccb 100644 --- a/uip/refile.c +++ b/uip/refile.c @@ -43,7 +43,7 @@ static struct swit switches[] = { #define VERSIONSW 11 { "version", 0 }, #define HELPSW 12 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/repl.c b/uip/repl.c index d3a8d07..f6d32d3 100644 --- a/uip/repl.c +++ b/uip/repl.c @@ -62,7 +62,7 @@ static struct swit switches[] = { #define VERSIONSW 25 { "version", 0 }, #define HELPSW 26 - { "help", 4 }, + { "help", 0 }, #define FILESW 27 { "file file", 4 }, /* interface from msh */ diff --git a/uip/rmf.c b/uip/rmf.c index 9b12304..233a7bf 100644 --- a/uip/rmf.c +++ b/uip/rmf.c @@ -15,7 +15,7 @@ static struct swit switches[] = { #define VERSIONSW 2 { "version", 0 }, #define HELPSW 3 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/rmm.c b/uip/rmm.c index 21a0f90..3523601 100644 --- a/uip/rmm.c +++ b/uip/rmm.c @@ -21,7 +21,7 @@ static struct swit switches[] = { #define VERSIONSW 2 { "version", 0 }, #define HELPSW 3 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/scan.c b/uip/scan.c index b40537c..7f5cf46 100644 --- a/uip/scan.c +++ b/uip/scan.c @@ -43,7 +43,7 @@ static struct swit switches[] = { #define VERSIONSW 10 { "version", 0 }, #define HELPSW 11 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/send.c b/uip/send.c index b98d89a..3e2dc60 100644 --- a/uip/send.c +++ b/uip/send.c @@ -67,7 +67,7 @@ static struct swit switches[] = { #define VERSIONSW 26 { "version", 0 }, #define HELPSW 27 - { "help", 4 }, + { "help", 0 }, #define BITSTUFFSW 28 { "dashstuffing", -12 }, #define NBITSTUFFSW 29 diff --git a/uip/slocal.c b/uip/slocal.c index e5f35c0..b665280 100644 --- a/uip/slocal.c +++ b/uip/slocal.c @@ -84,7 +84,7 @@ static struct swit switches[] = { #define VERSIONSW 13 { "version", 0 }, #define HELPSW 14 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/sortm.c b/uip/sortm.c index c7f5396..3ac2e3f 100644 --- a/uip/sortm.c +++ b/uip/sortm.c @@ -35,7 +35,7 @@ static struct swit switches[] = { #define VERSIONSW 8 { "version", 0 }, #define HELPSW 9 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/spost.c b/uip/spost.c index 206698e..76478c8 100644 --- a/uip/spost.c +++ b/uip/spost.c @@ -55,7 +55,7 @@ struct swit switches[] = { #define VERSIONSW 15 { "version", 0 }, #define HELPSW 16 - { "help", 4 }, + { "help", 0 }, #define DEBUGSW 17 { "debug", -5 }, #define DISTSW 18 diff --git a/uip/viamail.c b/uip/viamail.c index 2ee6b3d..a416fdf 100644 --- a/uip/viamail.c +++ b/uip/viamail.c @@ -42,7 +42,7 @@ static struct swit switches[] = { #define VERSIONSW 9 { "version", 0 }, #define HELPSW 10 - { "help", 4 }, + { "help", 0 }, #define DEBUGSW 11 { "debug", -5 }, { NULL, 0 } diff --git a/uip/vmh.c b/uip/vmh.c index b64bdab..2c2f6b5 100644 --- a/uip/vmh.c +++ b/uip/vmh.c @@ -106,7 +106,7 @@ static struct swit switches[] = { #define VERSIONSW 3 { "version", 0 }, #define HELPSW 4 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; diff --git a/uip/vmhtest.c b/uip/vmhtest.c index 46ecf8c..96676fd 100644 --- a/uip/vmhtest.c +++ b/uip/vmhtest.c @@ -16,7 +16,7 @@ static struct swit switches[] = { #define VERSIONSW 2 { "version", 0 }, #define HELPSW 3 - { "help", 4 }, + { "help", 0 }, { NULL, NULL } }; diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c index 854a972..0e2a998 100644 --- a/uip/whatnowsbr.c +++ b/uip/whatnowsbr.c @@ -26,7 +26,7 @@ static struct swit whatnowswitches[] = { #define VERSIONSW 6 { "version", 0 }, #define HELPSW 7 - { "help", 4 }, + { "help", 0 }, { NULL, 0 } }; @@ -655,7 +655,7 @@ static struct swit sendswitches[] = { #define SVERSIONSW 22 { "version", 0 }, #define SHELPSW 23 - { "help", 4 }, + { "help", 0 }, #define BITSTUFFSW 24 { "dashstuffing", -12 }, #define NBITSTUFFSW 25 diff --git a/uip/whom.c b/uip/whom.c index 5a82534..5d7172e 100644 --- a/uip/whom.c +++ b/uip/whom.c @@ -27,7 +27,7 @@ static struct swit switches[] = { #define VERSIONSW 7 { "version", 0 }, #define HELPSW 8 - { "help", 4 }, + { "help", 0 }, #define CLIESW 9 { "client host", -6 }, #define SERVSW 10 diff --git a/uip/wmh.c b/uip/wmh.c index 2e46dbb..cd1ffaa 100644 --- a/uip/wmh.c +++ b/uip/wmh.c @@ -40,7 +40,7 @@ static struct swit switches[] = { #define VERSIONSW 3 { "version", 0 }, #define HELPSW 4 - { "help", 4 }, + { "help", 0 }, { NULL, NULL } }; /* PEERS */