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 31d01c1..2a002a5 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -17,9 +17,6 @@
 #include <h/mh.h>
 #include <h/utils.h>
 
-#define FALSE   0
-#define TRUE    1
-
 /*
 ** We allocate space to record the names of folders
 ** (foldersToDo array), this number of elements at a time.
@@ -33,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
-       { "version", 0 },
-#define HELPSW  14
+       { "nofast", 2 },
+#define VERSIONSW  11
+       { "Version", 0 },
+#define HELPSW  12
        { "help", 0 },
        { NULL, 0 }
 };
@@ -74,7 +67,7 @@ static struct Folder *orders = NULL;
 static int nOrders = 0;
 static int nOrdersAlloced = 0;
 static struct Folder *folders = NULL;
-static int nFolders = 0;
+static unsigned int nFolders = 0;
 static int nFoldersAlloced = 0;
 
 /* info on folders to search */
@@ -84,13 +77,13 @@ static int maxfolders;
 
 /* info on sequences to search for */
 static char *sequencesToDo[NUMATTRS];
-static int numsequences;
+static unsigned int numsequences;
 
 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 */
@@ -202,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:
@@ -369,7 +359,7 @@ BuildFolderList(char *dirName, int searchdepth)
        ** If base directory, don't add it to the
        ** folder list. We just recurse into it.
        */
-       if (!strcmp(dirName, ".")) {
+       if (strcmp(dirName, ".")==0) {
                BuildFolderListRecurse(".", &st, 0);
                return;
        }
@@ -414,10 +404,11 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
        ** A hack so that we don't see a
        ** leading "./" in folder names.
        */
-       base = strcmp(dirName, ".") ? dirName : dirName + 1;
+       base = (strcmp(dirName, ".")==0) ? dirName + 1 : dirName;
 
        while (nlinks && (dp = readdir(dir))) {
-               if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) {
+               if (strcmp(dp->d_name, ".")==0 ||
+                               strcmp(dp->d_name, "..")==0) {
                        nlinks--;
                        continue;
                }
@@ -459,7 +450,8 @@ BuildFolderListRecurse(char *dirName, struct stat *s, int searchdepth)
 int
 AddFolder(char *name, int force)
 {
-       int i, msgnum, nonzero;
+       unsigned int i;
+       int msgnum, nonzero;
        int seqnum[NUMATTRS], nSeq[NUMATTRS];
        struct Folder *f;
        struct msgs *mp;
@@ -531,11 +523,11 @@ void
 PrintFolders(void)
 {
        char tmpname[BUFSIZ];
-       int i, j, len, has_private = 0;
-       int maxfolderlen = 0, maxseqlen = 0;
+       unsigned int i, j, len, has_private = 0;
+       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;
@@ -583,7 +575,7 @@ PrintFolders(void)
                for (j = 0; j < numsequences; j++) {
                        if (folders[i].nSeq[j] > 0 || showzero) {
                                /* Add `+' to end of name of current folder */
-                               if (strcmp(curfol, folders[i].name))
+                               if (strcmp(curfol, folders[i].name)!=0)
                                        snprintf(tmpname, sizeof(tmpname),
                                                        "%s", folders[i].name);
                                else
@@ -652,15 +644,15 @@ AssignPriority(char *name)
        nl = strlen(name);
        for (i = 0; i < nOrders; ++i) {
                o = &orders[i];
-               if (!strcmp(name, o->name))
+               if (strcmp(name, o->name)==0)
                        return o->priority;
                ol = strlen(o->name);
                if (nl < ol - 1)
                        continue;
                if (ol < bestLen)
                        continue;
-               if (o->name[0] == '*' && !strcmp(o->name + 1,
-                               name + (nl - ol + 1))) {
+               if (o->name[0] == '*' &&
+                               strcmp(o->name + 1, name + (nl - ol + 1))==0) {
                        best = o->priority;
                        bestLen = ol;
                } else if (o->name[ol - 1] == '*' &&
@@ -683,11 +675,12 @@ do_readonly_folders(void)
        char atrcur[BUFSIZ];
        register struct node *np;
 
-       snprintf(atrcur, sizeof(atrcur), "atr-%s-", current);
+       snprintf(atrcur, sizeof(atrcur), "atr-%s-", seq_cur);
        atrlen = strlen(atrcur);
 
        for (np = m_defs; np; np = np->n_next)
-               if (isprefix(atrcur, np->n_name)
-                               && !isprefix(nmhdir, np->n_name + atrlen))
+               if (strncmp(np->n_name, atrcur, atrlen)==0
+                               && strncmp(np->n_name+atrlen, nmhdir, strlen(nmhdir))!=0)
+                       /* Why do we exclude absolute path names? --meillo */
                        BuildFolderList(np->n_name + atrlen, 0);
 }