Changed sign of minchars for the SASL-related switches from

negative to positive so the won't be hidden from help messages.
I think.

diff --git a/uip/inc.c b/uip/inc.c
index a47b3367ad69dffc37684d92f5ccfa16143c76e1..f1bafd905252713c83fcf67ae8fae3ec17bbb821 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -70,10 +70,10 @@
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("snoop", -5, SNOOPSW) \
-    X("sasl", SASLminc(-4), SASLSW) \
-    X("nosasl", SASLminc(-6), NOSASLSW) \
-    X("saslmech", SASLminc(-8), SASLMECHSW) \
-    X("authservice", SASLminc(-11), AUTHSERVICESW) \
+    X("sasl", SASLminc(5), SASLSW) \
+    X("nosasl", SASLminc(3), NOSASLSW) \
+    X("saslmech", SASLminc(5), SASLMECHSW) \
+    X("authservice", SASLminc(0), AUTHSERVICESW) \
     X("proxy command", 0, PROXYSW) \
 
 #define X(sw, minchars, id) id,

diff --git a/uip/mhlogin.c b/uip/mhlogin.c
index a08305c846d318fd0fa582b40fa4a131fa5db8ac..e6b791b621a1db274e26e9244ceabf27e62a068d 100644 (file)
--- a/uip/mhlogin.c
+++ b/uip/mhlogin.c
@@ -13,11 +13,11 @@
 #include <h/oauth.h>
 
 #define MHLOGIN_SWITCHES \
-    X("saslmech", 1, SASLMECHSW) \
-    X("authservice", -11, AUTHSERVICESW) \
-    X("snoop", 1, SNOOPSW) \
-    X("help", 1, HELPSW) \
-    X("version", 1, VERSIONSW) \
+    X("saslmech", 0, SASLMECHSW) \
+    X("authservice", 0, AUTHSERVICESW) \
+    X("snoop", 0, SNOOPSW) \
+    X("help", 0, HELPSW) \
+    X("version", 0, VERSIONSW) \
 
 #define X(sw, minchars, id) id,
 DEFINE_SWITCH_ENUM(MHLOGIN);

diff --git a/uip/msgchk.c b/uip/msgchk.c
index d1b1cb788c4f46dc2610c42421d3d76c8a5d58a7..e0eaeb8b8327766d9a9bfd66b27f9a5314a73337 100644 (file)
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -31,9 +31,9 @@
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("snoop", -5, SNOOPSW) \
-    X("sasl", SASLminc(-4), SASLSW) \
-    X("saslmech", SASLminc(-5), SASLMECHSW) \
-    X("authservice", SASLminc(-11), AUTHSERVICESW) \
+    X("sasl", SASLminc(4), SASLSW) \
+    X("saslmech", SASLminc(5), SASLMECHSW) \
+    X("authservice", SASLminc(0), AUTHSERVICESW) \
     X("proxy command", 0, PROXYSW) \
 
 #define X(sw, minchars, id) id,

diff --git a/uip/post.c b/uip/post.c
index 836a817cc741ae9085727b4a1fb5cb2e335c9b86..db457ad2517355366dbf0086b8e0d55bede1853b 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -76,11 +76,11 @@
     X("server host", 6, SERVSW) /* specify alternate SMTP server */ \
     X("snoop", -5, SNOOPSW) /* snoop the SMTP transaction */ \
     X("partno", -6, PARTSW) \
-    X("sasl", SASLminc(-4), SASLSW) \
-    X("nosasl", SASLminc(-6), NOSASLSW) \
-    X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
-    X("saslmech", SASLminc(-5), SASLMECHSW) \
-    X("authservice", SASLminc(-11), AUTHSERVICESW) \
+    X("sasl", SASLminc(4), SASLSW) \
+    X("nosasl", SASLminc(6), NOSASLSW) \
+    X("saslmaxssf", SASLminc(10), SASLMXSSFSW) \
+    X("saslmech", SASLminc(5), SASLMECHSW) \
+    X("authservice", SASLminc(0), AUTHSERVICESW) \
     X("user", SASLminc(-4), USERSW) \
     X("port server submission port name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \

diff --git a/uip/send.c b/uip/send.c
index a9d48420d368f4d77ad664ce80bb468aafcfaa84..a623964fe0baffab3f3239c3b574f07faa62f8dd 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -62,10 +62,10 @@
     X("server host", 6, SERVSW) \
     X("snoop", 5, SNOOPSW) \
     X("sasl", SASLminc(4), SASLSW) \
-    X("nosasl", SASLminc(-6), NOSASLSW) \
-    X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
-    X("saslmech mechanism", SASLminc(-5), SASLMECHSW) \
-    X("authservice", SASLminc(-11), AUTHSERVICESW) \
+    X("nosasl", SASLminc(6), NOSASLSW) \
+    X("saslmaxssf", SASLminc(6), SASLMXSSFSW) \
+    X("saslmech mechanism", SASLminc(6), SASLMECHSW) \
+    X("authservice", SASLminc(0), AUTHSERVICESW) \
     X("user username", SASLminc(-4), USERSW) \
     X("attach", -6, ATTACHSW) \
     X("noattach", -8, NOATTACHSW) \

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index b9518e8b8b9c7bebd3f6b30255fc8b5b9c9ea0ac..0aca3e977002df08dec503ff32e9c5b8527a00cc 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -945,12 +945,12 @@ buildfile (char **argp, char *file)
     X("draftfolder +folder", -6, SDRFSW) \
     X("draftmessage msg", -6, SDRMSW) \
     X("nodraftfolder", -3, SNDRFSW) \
-    X("sasl", SASLminc(-4), SASLSW) \
-    X("nosasl", SASLminc(-6), NOSASLSW) \
-    X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
-    X("saslmech", SASLminc(-5), SASLMECHSW) \
-    X("authservice", SASLminc(-11), AUTHSERVICESW) \
-    X("user username", SASLminc(-4), USERSW) \
+    X("sasl", SASLminc(4), SASLSW) \
+    X("nosasl", SASLminc(6), NOSASLSW) \
+    X("saslmaxssf", SASLminc(10), SASLMXSSFSW) \
+    X("saslmech", SASLminc(5), SASLMECHSW) \
+    X("authservice", SASLminc(0), AUTHSERVICESW) \
+    X("user username", SASLminc(4), USERSW) \
     X("attach fieldname", 6, SNDATTACHSW) \
     X("noattach", 0, SNDNOATTACHSW) \
     X("attachformat", 7, SNDATTACHFORMAT) \