Move #include from h/mh.h to source files

[mmh] / uip / flist.c

diff --git a/uip/flist.c b/uip/flist.c
index c69055a..c0a056c 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -16,6 +16,11 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 /*
 ** We allocate space to record the names of folders
@@ -30,30 +35,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 }
 };
@@ -71,7 +72,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 */
@@ -81,13 +82,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 */
@@ -122,9 +123,7 @@ main(int argc, char **argv)
        char **arguments;
        char buf[BUFSIZ];
 
-#ifdef LOCALE
        setlocale(LC_ALL, "");
-#endif
        invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
@@ -155,17 +154,18 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               done(1);
+                               /* sysexits.h EX_USAGE */
+                               exit(1);
                        case UNKWNSW:
                                adios(NULL, "-%s unknown", cp);
 
                        case HELPSW:
                                snprintf(buf, sizeof(buf), "%s [+folder1 [+folder2 ...]][switches]", invo_name);
                                print_help(buf, switches, 1);
-                               done(1);
+                               exit(0);
                        case VERSIONSW:
                                print_version(invo_name);
-                               done(1);
+                               exit(0);
 
                        case SEQSW:
                                if (!(cp = *argp++) || *cp == '-')
@@ -199,14 +199,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:
@@ -269,8 +266,7 @@ main(int argc, char **argv)
        qsort(folders, nFolders, sizeof(struct Folder),
                        (qsort_comp) CompareFolders);
        PrintFolders();
-       done(0);
-       return 1;
+       return 0;
 }
 
 /*
@@ -457,7 +453,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;
@@ -529,11 +526,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;