X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Ffolder.c;h=84b43650b77a3a3b4f37fc331651655ed95db00b;hp=34b3d9880f8c654c2440e8b914e4f9ff40b914e7;hb=2abb9a7cfb0930e27062088734d306e7d78e4cc2;hpb=5f2b39344cca1086c975d47b730929d8f1904214

diff --git a/uip/folder.c b/uip/folder.c
index 34b3d98..84b4365 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -12,6 +12,8 @@
 #include <h/crawl_folders.h>
 #include <h/utils.h>
 #include <errno.h>
+#include <unistd.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define ALLSW  0
@@ -115,9 +117,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 +138,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 +317,9 @@ main(int argc, char **argv)
 		}
 		printf("\n");
 
-		if (!printsw)
-			done(0);
+		if (!printsw) {
+			exit(0);
+		}
 	}
 
 	/* Allocate initial space to record folder information */
@@ -367,7 +369,7 @@ main(int argc, char **argv)
 		** Check if folder exists.  If not, then see if
 		** we should create it, or just exit.
 		*/
-		create_folder(toabsdir(folder), fcreat, done);
+		create_folder(toabsdir(folder), fcreat, exit);
 
 		if (get_folder_info(folder, msg) && argfolder) {
 			/* update current folder */
@@ -381,8 +383,7 @@ main(int argc, char **argv)
 	print_folders();
 
 	context_save();
-	done(0);
-	return 1;
+	return 0;
 }
 
 static int
@@ -424,8 +425,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 */
 		}