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

[mmh] / uip / flist.c

diff --git a/uip/flist.c b/uip/flist.c
index 71ae8e8..2a002a5 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -30,30 +30,26 @@ 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 },
-#define TOTALSW  11
-       { "total", -5 },
-#define NOTOTALSW  12
-       { "nototal", -7 },
-#define VERSIONSW  13
+       { "nofast", 2 },
+#define VERSIONSW  11
        { "Version", 0 },
-#define HELPSW  14
+#define HELPSW  12
        { "help", 0 },
        { NULL, 0 }
 };
@@ -87,7 +83,7 @@ static int all = FALSE;  /* scan all folders in top level? */
 static int alphaOrder = FALSE;  /* want alphabetical order only */
 static int recurse = FALSE;  /* show nested folders? */
 static int showzero   = TRUE;  /* show folders even if no messages in seq? */
-static int Total = TRUE;  /* display info on number of messages in
+static int fastsw = FALSE;  /* display info on number of messages in
                * sequence found, and total num messages */
 
 static char curfol[BUFSIZ];  /* name of the current folder */
@@ -199,14 +195,11 @@ main(int argc, char **argv)
                                alphaOrder = FALSE;
                                break;
 
-                       case NOFASTSW:
-                       case TOTALSW:
-                               Total = TRUE;
-                               break;
-
                        case FASTSW:
-                       case NOTOTALSW:
-                               Total = FALSE;
+                               fastsw = TRUE;
+                               break;
+                       case NOFASTSW:
+                               fastsw = FALSE;
                                break;
 
                        case RECURSE:
@@ -534,7 +527,7 @@ PrintFolders(void)
        unsigned int maxfolderlen = 0, maxseqlen = 0;
        int maxnum = 0, maxseq = 0;
 
-       if (!Total) {
+       if (fastsw) {
                for (i = 0; i < nFolders; i++)
                        printf("%s\n", folders[i].name);
                return;