X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Ffolder.c;h=92ee49624e18849800b1dfe324860bdba807c6aa;hp=584bb768c0e19d4b6d1703a4140e139ab9f25e54;hb=fede6e42d81ce34fd5c1bbe7fb2757b281c2573a;hpb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a

diff --git a/uip/folder.c b/uip/folder.c
index 584bb76..92ee496 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -17,35 +17,35 @@ static struct swit switches[] = {
 #define ALLSW  0
 	{ "all", 0 },
 #define NALLSW  1
-	{ "noall", 0 },
+	{ "noall", 2 },
 #define CREATSW  2
 	{ "create", 0 },
 #define NCREATSW  3
-	{ "nocreate", 0 },
+	{ "nocreate", 2 },
 #define FASTSW  4
 	{ "fast", 0 },
 #define NFASTSW  5
-	{ "nofast", 0 },
+	{ "nofast", 2 },
 #define PACKSW  6
 	{ "pack", 0 },
 #define NPACKSW  7
-	{ "nopack", 0 },
+	{ "nopack", 2 },
 #define VERBSW  8
 	{ "verbose", 0 },
 #define NVERBSW  9
-	{ "noverbose", 0 },
+	{ "noverbose", 2 },
 #define RECURSW  10
 	{ "recurse", 0 },
 #define NRECRSW  11
-	{ "norecurse", 0 },
+	{ "norecurse", 2 },
 #define TOTALSW  12
 	{ "total", 0 },
 #define NTOTLSW  13
-	{ "nototal", 0 },
+	{ "nototal", 2 },
 #define LISTSW  14
 	{ "list", 0 },
 #define NLISTSW  15
-	{ "nolist", 0 },
+	{ "nolist", 2 },
 #define PRNTSW  16
 	{ "print", 0 },
 #define NPRNTSW  17
@@ -115,9 +115,7 @@ main(int argc, char **argv)
 	char *cp, *dp, *msg = NULL, *argfolder = NULL;
 	char **ap, **argp, buf[BUFSIZ], **arguments;
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -138,17 +136,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 [+folder] [msg] [switches]", invo_name);
 				print_help(buf, switches, 1);
-				done(1);
+				exit(0);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(0);
 
 			case ALLSW:
 				all = 1;
@@ -316,8 +315,9 @@ main(int argc, char **argv)
 		}
 		printf("\n");
 
-		if (!printsw)
-			done(0);
+		if (!printsw) {
+			exit(0);
+		}
 	}
 
 	/* Allocate initial space to record folder information */
@@ -381,8 +381,7 @@ main(int argc, char **argv)
 	print_folders();
 
 	context_save();
-	done(0);
-	return 1;
+	return 0;
 }
 
 static int
@@ -424,8 +423,9 @@ get_folder_info_body(char *fold, char *msg, boolean *crawl_children)
 			retval = 0;
 
 		if (fpack) {
-			if (folder_pack(&mp, fverb) == -1)
-				done(1);
+			if (folder_pack(&mp, fverb) == -1) {
+				exit(0);
+			}
 			seq_save(mp);  /* synchronize the sequences */
 			context_save();  /* save the context file */
 		}