X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fflist.c;h=c0c8b5f63c4c4443cb34354158cc9f369080c90f;hp=c98a3f0629509b6ec48c61037f486afb02950e5c;hb=fede6e42d81ce34fd5c1bbe7fb2757b281c2573a;hpb=d3ba09a465cb0e5fc9a74d0b152a7ed965f895cb

diff --git a/uip/flist.c b/uip/flist.c
index c98a3f0..c0c8b5f 100644
--- 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 */
@@ -125,9 +118,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 */
@@ -158,17 +149,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 == '-')
@@ -202,14 +194,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:
@@ -272,8 +261,7 @@ main(int argc, char **argv)
 	qsort(folders, nFolders, sizeof(struct Folder),
 			(qsort_comp) CompareFolders);
 	PrintFolders();
-	done(0);
-	return 1;
+	return 0;
 }
 
 /*
@@ -460,7 +448,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;
@@ -532,11 +521,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;