Require at least 2 chars for `no' variants of switches.

This results in:
	ali -n      --> -normalize
	ali -no     --> ambiguous
	folder -n   --> unknown (don't know if this case is good)
	folder -no  --> ambiguous

diff --git a/uip/ali.c b/uip/ali.c
index 73f7166..8effd63 100644 (file)
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -24,15 +24,15 @@ static struct swit switches[] = {
 #define LISTSW     2
        { "list", 0 },
 #define NLISTSW    3
-       { "nolist", 0 },
+       { "nolist", 2 },
 #define NORMSW     4
        { "normalize", 0 },
 #define NNORMSW    5
-       { "nonormalize", 0 },
+       { "nonormalize", 2 },
 #define USERSW     6
        { "user", 0 },
 #define NUSERSW    7
-       { "nouser", 0 },
+       { "nouser", 2 },
 #define VERSIONSW  8
        { "Version", 0 },
 #define HELPSW     9

diff --git a/uip/anno.c b/uip/anno.c
index 3958eb1..c80b782 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -26,7 +26,7 @@ static struct swit switches[] = {
 #define DATESW 1
        { "date", 0 },
 #define NDATESW 2
-       { "nodate", 0 },
+       { "nodate", 2 },
 #define TEXTSW 3
        { "text body", 0 },
 #define VERSIONSW 4
@@ -44,7 +44,7 @@ static struct swit switches[] = {
 #define PRESERVESW 10
        { "preserve", 0 },
 #define NOPRESERVESW 11
-       { "nopreserve", 0 },
+       { "nopreserve", 2 },
        { NULL, 0 }
 };
 

diff --git a/uip/ap.c b/uip/ap.c
index 3bb2bf0..9f8e6f0 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -20,7 +20,7 @@ static struct swit switches[] = {
 #define NORMSW 1
        { "normalize", 0 },
 #define NNORMSW 2
-       { "nonormalize", 0 },
+       { "nonormalize", 2 },
 #define VERSIONSW 3
        { "Version", 0 },
 #define HELPSW 4

diff --git a/uip/burst.c b/uip/burst.c
index 8d6e69b..1464cd6 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -12,7 +12,7 @@ static struct swit switches[] = {
 #define VERBSW 0
        { "verbose", 0 },
 #define NVERBSW 1
-       { "noverbose", 0 },
+       { "noverbose", 2 },
 #define VERSIONSW 2
        { "Version", 0 },
 #define HELPSW 3

diff --git a/uip/comp.c b/uip/comp.c
index 1c45a98..680c0fc 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -18,7 +18,7 @@ static struct swit switches[] = {
 #define USESW  2
        { "use", 0 },
 #define NUSESW  3
-       { "nouse", 0 },
+       { "nouse", 2 },
 #define WHATSW  4
        { "whatnowproc program", 0 },
 #define VERSIONSW  5

diff --git a/uip/dist.c b/uip/dist.c
index 3db8cfc..d00f686 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -14,7 +14,7 @@ static struct swit switches[] = {
 #define ANNOSW  0
        { "annotate", 0 },
 #define NANNOSW  1
-       { "noannotate", 0 },
+       { "noannotate", 2 },
 #define EDITRSW  2
        { "editor editor", 0 },
 #define FORMSW  3

diff --git a/uip/flist.c b/uip/flist.c
index ac68080..2a002a5 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -30,23 +30,23 @@ static struct swit switches[] = {
 #define ALLSW  1
        { "all", 0 },
 #define NOALLSW  2
-       { "noall", 0 },
+       { "noall", 2 },
 #define RECURSE  3
        { "recurse", 0 },
 #define NORECURSE  4
-       { "norecurse", 0 },
+       { "norecurse", 2 },
 #define SHOWZERO  5
        { "showzero", 0 },
 #define NOSHOWZERO  6
-       { "noshowzero", 0 },
+       { "noshowzero", 2 },
 #define ALPHASW  7
        { "alpha", 0 },
 #define NOALPHASW  8
-       { "noalpha", 0 },
+       { "noalpha", 2 },
 #define FASTSW  9
        { "fast", 0 },
 #define NOFASTSW  10
-       { "nofast", 0 },
+       { "nofast", 2 },
 #define VERSIONSW  11
        { "Version", 0 },
 #define HELPSW  12

diff --git a/uip/folder.c b/uip/folder.c
index 584bb76..34b3d98 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -17,35 +17,35 @@ static struct swit switches[] = {
 #define ALLSW  0
        { "all", 0 },
 #define NALLSW  1
-       { "noall", 0 },
+       { "noall", 2 },
 #define CREATSW  2
        { "create", 0 },
 #define NCREATSW  3
-       { "nocreate", 0 },
+       { "nocreate", 2 },
 #define FASTSW  4
        { "fast", 0 },
 #define NFASTSW  5
-       { "nofast", 0 },
+       { "nofast", 2 },
 #define PACKSW  6
        { "pack", 0 },
 #define NPACKSW  7
-       { "nopack", 0 },
+       { "nopack", 2 },
 #define VERBSW  8
        { "verbose", 0 },
 #define NVERBSW  9
-       { "noverbose", 0 },
+       { "noverbose", 2 },
 #define RECURSW  10
        { "recurse", 0 },
 #define NRECRSW  11
-       { "norecurse", 0 },
+       { "norecurse", 2 },
 #define TOTALSW  12
        { "total", 0 },
 #define NTOTLSW  13
-       { "nototal", 0 },
+       { "nototal", 2 },
 #define LISTSW  14
        { "list", 0 },
 #define NLISTSW  15
-       { "nolist", 0 },
+       { "nolist", 2 },
 #define PRNTSW  16
        { "print", 0 },
 #define NPRNTSW  17

diff --git a/uip/forw.c b/uip/forw.c
index cbff866..b75bd2e 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -20,7 +20,7 @@ static struct swit switches[] = {
 #define ANNOSW  0
        { "annotate", 0 },
 #define NANNOSW  1
-       { "noannotate", 0 },
+       { "noannotate", 2 },
 #define EDITRSW  2
        { "editor editor", 0 },
 #define FORMSW  3

diff --git a/uip/inc.c b/uip/inc.c
index e155784..4b75c6e 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -41,11 +41,11 @@ static struct swit switches[] = {
 #define AUDSW  0
        { "audit audit-file", 0 },
 #define NAUDSW  1
-       { "noaudit", 0 },
+       { "noaudit", 2 },
 #define CHGSW  2
        { "changecur", 0 },
 #define NCHGSW  3
-       { "nochangecur", 0 },
+       { "nochangecur", 2 },
 #define FILESW  4
        { "file name", 0 },
 #define FORMSW  5
@@ -53,11 +53,11 @@ static struct swit switches[] = {
 #define SILSW  6
        { "silent", 0 },
 #define NSILSW  7
-       { "nosilent", 0 },
+       { "nosilent", 2 },
 #define TRNCSW  8
        { "truncate", 0 },
 #define NTRNCSW  9
-       { "notruncate", 0 },
+       { "notruncate", 2 },
 #define WIDTHSW  10
        { "width columns", 0 },
 #define VERSIONSW  11

diff --git a/uip/mark.c b/uip/mark.c
index 3818c29..c1da644 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -23,11 +23,11 @@ static struct swit switches[] = {
 #define PUBLSW  4
        { "public", 0 },
 #define NPUBLSW  5
-       { "nopublic", 0 },
+       { "nopublic", 2 },
 #define ZEROSW  6
        { "zero", 0 },
 #define NZEROSW  7
-       { "nozero", 0 },
+       { "nozero", 2 },
 #define VERSIONSW  8
        { "Version", 0 },
 #define HELPSW  9

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 12e6548..76626db 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -32,7 +32,7 @@ static struct swit switches[] = {
 #define VERBSW  0
        { "verbose", 0 },
 #define NVERBSW  1
-       { "noverbose", 0 },
+       { "noverbose", 2 },
 #define VERSIONSW  2
        { "Version", 0 },
 #define HELPSW  3

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 7129ce5..e507127 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -20,7 +20,7 @@ static struct swit switches[] = {
 #define VERBSW  0
        { "verbose", 0 },
 #define NVERBSW  1
-       { "noverbose", 0 },
+       { "noverbose", 2 },
 #define FILESW  2  /* interface from show */
        { "file file", 0 },
 #define PARTSW  3

diff --git a/uip/mhparam.c b/uip/mhparam.c
index fe98461..a339945 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -15,7 +15,7 @@ static struct swit switches[] = {
 #define COMPSW  0
        { "components", 0 },
 #define NCOMPSW  1
-       { "nocomponents", 0 },
+       { "nocomponents", 2 },
 #define ALLSW  2
        { "all", 0 },
 #define VERSIONSW 3

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 1ee5c82..e1bcf8f 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -20,7 +20,7 @@ static struct swit switches[] = {
 #define VERBSW  0
        { "verbose", 0 },
 #define NVERBSW  1
-       { "noverbose", 0 },
+       { "noverbose", 2 },
 #define FILESW  2  /* interface from show */
        { "file file", 0 },
 #define FORMSW  3

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 259acf3..b0c08da 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -21,7 +21,7 @@ static struct swit switches[] = {
 #define AUTOSW  0
        { "auto", 0 },
 #define NAUTOSW  1
-       { "noauto", 0 },
+       { "noauto", 2 },
 #define FILESW  2  /* interface from show */
        { "file file", 0 },
 #define PARTSW  3

diff --git a/uip/mhtest.c b/uip/mhtest.c
index 871270e..d24694e 100644 (file)
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -20,7 +20,7 @@ static struct swit switches[] = {
 #define VERBSW  0
        { "verbose", 0 },
 #define NVERBSW  1
-       { "noverbose", 0 },
+       { "noverbose", 2 },
 #define FILESW  2
        { "file file", 0 },
 #define OUTFILESW  3

diff --git a/uip/pick.c b/uip/pick.c
index fa5531a..b817a0b 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -51,15 +51,15 @@ static struct swit switches[] = {
 #define PUBLSW  16
        { "public", 0 },
 #define NPUBLSW  17
-       { "nopublic", 0 },
+       { "nopublic", 2 },
 #define ZEROSW  18
        { "zero", 0 },
 #define NZEROSW  19
-       { "nozero", 0 },
+       { "nozero", 2 },
 #define LISTSW  20
        { "list", 0 },
 #define NLISTSW  21
-       { "nolist", 0 },
+       { "nolist", 2 },
 #define VERSIONSW  22
        { "Version", 0 },
 #define HELPSW  23

diff --git a/uip/prompter.c b/uip/prompter.c
index 6db0455..024f604 100644 (file)
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -33,11 +33,11 @@ static struct swit switches[] = {
 #define PREPSW  2
        { "prepend", 0 },
 #define NPREPSW  3
-       { "noprepend", 0 },
+       { "noprepend", 2 },
 #define RAPDSW  4
        { "rapid", 0 },
 #define NRAPDSW  5
-       { "norapid", 0 },
+       { "norapid", 2 },
 #define BODYSW  6
        { "body", -4 },
 #define NBODYSW  7
@@ -45,7 +45,7 @@ static struct swit switches[] = {
 #define DOTSW  8
        { "doteof", 0 },
 #define NDOTSW  9
-       { "nodoteof", 0 },
+       { "nodoteof", 2 },
 #define VERSIONSW 10
        { "Version", 0 },
 #define HELPSW  11

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 5602dbc..8121e2d 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -16,19 +16,19 @@ static struct swit switches[] = {
 #define CRETSW  0
        { "create",   0 },
 #define NCRETSW  1
-       { "nocreate", 0 },
+       { "nocreate", 2 },
 #define UNSEENSW  2
        { "unseen",   0 },
 #define NUNSEENSW  3
-       { "nounseen", 0 },
+       { "nounseen", 2 },
 #define PUBSW  4
        { "public",   0 },
 #define NPUBSW  5
-       { "nopublic", 0 },
+       { "nopublic", 2 },
 #define ZEROSW  6
        { "zero",     0 },
 #define NZEROSW  7
-       { "nozero",   0 },
+       { "nozero",   2 },
 #define SEQSW  8
        { "sequence name", 0 },
 #define VERSIONSW  9

diff --git a/uip/refile.c b/uip/refile.c
index e4433bd..76384dd 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -16,7 +16,7 @@ static struct swit switches[] = {
 #define LINKSW  0
        { "link", 0 },
 #define NLINKSW  1
-       { "nolink", 0 },
+       { "nolink", 2 },
 #define SRCSW  2
        { "src +folder", 0 },
 #define FILESW  3

diff --git a/uip/repl.c b/uip/repl.c
index d847840..462498e 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -18,31 +18,31 @@ static struct swit switches[] = {
 #define GROUPSW  0
        { "group", 0 },
 #define NGROUPSW  1
-       { "nogroup", 0 },
+       { "nogroup", 2 },
 #define ANNOSW  2
        { "annotate", 0 },
 #define NANNOSW  3
-       { "noannotate", 0 },
+       { "noannotate", 2 },
 #define CCSW  4
        { "cc all|to|cc|me", 0 },
 #define NCCSW  5
-       { "nocc type", 0 },
+       { "nocc type", 2 },
 #define EDITRSW  6
        { "editor editor", 0 },
 #define FILTSW  7
        { "filter filterfile", 0 },
 #define NFILTSW  8
-       { "nofilter", 0 },
+       { "nofilter", 2 },
 #define FORMSW  9
        { "form formfile", 0 },
 #define MIMESW  10
        { "mime", 0 },
 #define NMIMESW  11
-       { "nomime", 0 },
+       { "nomime", 2 },
 #define QURYSW  12
        { "query", 0 },
 #define NQURYSW  13
-       { "noquery", 0 },
+       { "noquery", 2 },
 #define WHATSW  14
        { "whatnowproc program", 0 },
 #define VERSIONSW  15

diff --git a/uip/rmf.c b/uip/rmf.c
index 096a9bf..9d20752 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -12,7 +12,7 @@ static struct swit switches[] = {
 #define INTRSW  0
        { "interactive", 0 },
 #define NINTRSW  1
-       { "nointeractive", 0 },
+       { "nointeractive", 2 },
 #define VERSIONSW  2
        { "Version", 0 },
 #define HELPSW  3

diff --git a/uip/rmm.c b/uip/rmm.c
index 0316c2c..0aab0ba 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -13,7 +13,7 @@ static struct swit switches[] = {
 #define UNLINKSW  0
        { "unlink", 0 },
 #define NUNLINKSW  1
-       { "nounlink", 0 },
+       { "nounlink", 2 },
 #define VERSIONSW  2
        { "Version", 0 },
 #define HELPSW  3

diff --git a/uip/send.c b/uip/send.c
index 84e05df..06058e8 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -60,11 +60,11 @@ static struct swit switches[] = {
 #define VERBSW  2
        { "verbose", 0 },
 #define NVERBSW  3
-       { "noverbose", 0 },
+       { "noverbose", 2 },
 #define WATCSW  4
        { "watch", 0 },
 #define NWATCSW  5
-       { "nowatch", 0 },
+       { "nowatch", 2 },
 #define VERSIONSW  6
        { "Version", 0 },
 #define HELPSW  7

diff --git a/uip/slocal.c b/uip/slocal.c
index bd6b0a2..ec788e3 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -59,7 +59,7 @@ static struct swit switches[] = {
 #define VERBSW  8
        { "verbose", 0 },
 #define NVERBSW  9
-       { "noverbose", 0 },
+       { "noverbose", 2 },
 #define DEBUGSW  10
        { "debug", 0 },
 #define VERSIONSW  11

diff --git a/uip/sortm.c b/uip/sortm.c
index 9e96d5a..4cd999d 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -16,15 +16,15 @@ static struct swit switches[] = {
 #define TEXTSW  1
         { "textfield field", 0 },
 #define NSUBJSW  2
-        { "notextfield", 0 },
+        { "notextfield", 2 },
 #define LIMSW  3
         { "limit days", 0 },
 #define NLIMSW  4
-        { "nolimit", 0 },
+        { "nolimit", 2 },
 #define VERBSW  5
         { "verbose", 0 },
 #define NVERBSW  6
-        { "noverbose", 0 },
+        { "noverbose", 2 },
 #define VERSIONSW  7
         { "Version", 0 },
 #define HELPSW  8

diff --git a/uip/spost.c b/uip/spost.c
index f3630d2..4384bc4 100644 (file)
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -23,15 +23,15 @@ struct swit switches[] = {
 #define VERBSW  0
        { "verbose", 0 },
 #define NVERBSW  1
-       { "noverbose", 0 },
+       { "noverbose", 2 },
 #define WATCSW  2
        { "watch", 0 },
 #define NWATCSW  3
-       { "nowatch", 0 },
+       { "nowatch", 2 },
 #define ALIASW  4
        { "alias aliasfile", 0 },
 #define NALIASW  5
-       { "noalias", 0 },
+       { "noalias", 2 },
 #define VERSIONSW  6
        { "Version", 0 },
 #define HELPSW  7