X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhstore.c;h=74442ad5a4fb6fc32d655868f3993ae9dbee3655;hp=b0c08da1b58bda8aafb36f7eaa668eb7cfc4f130;hb=2abb9a7cfb0930e27062088734d306e7d78e4cc2;hpb=5f2b39344cca1086c975d47b730929d8f1904214

diff --git a/uip/mhstore.c b/uip/mhstore.c
index b0c08da..74442ad 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -10,12 +10,14 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <errno.h>
-#include <setjmp.h>
 #include <signal.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define AUTOSW  0
@@ -64,7 +66,7 @@ void flush_errors(void);
 /* mhfree.c */
 void free_content(CT);
 extern CT *cts;  /* The list of top-level contents to display */
-void freects_done(int) NORETURN;
+void freects_done();
 
 /*
 ** static prototypes
@@ -130,11 +132,11 @@ main(int argc, char **argv)
 	CT ct, *ctp;
 	FILE *fp;
 
-	done=freects_done;
+	if (atexit(freects_done) != 0) {
+		adios(NULL, "atexit failed");
+	}
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -151,17 +153,17 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				exit(1);
 			case UNKWNSW:
 				adios(NULL, "-%s unknown", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
 				print_help(buf, switches, 1);
-				done(1);
+				exit(0);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(0);
 
 			case AUTOSW:
 				autosw++;
@@ -288,7 +290,7 @@ main(int argc, char **argv)
 		/* parse all the message ranges/sequences and set SELECTED */
 		for (msgnum = 0; msgnum < msgs.size; msgnum++)
 			if (!m_convert(mp, msgs.msgs[msgnum]))
-				done(1);
+				exit(1);
 		seq_setprev(mp);  /* set the previous-sequence */
 
 		if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1),
@@ -308,7 +310,7 @@ main(int argc, char **argv)
 	}
 
 	if (!*cts)
-		done(1);
+		exit(1);
 
 	userrs = 1;
 	SIGNAL(SIGQUIT, quitser);
@@ -349,8 +351,7 @@ main(int argc, char **argv)
 		context_save();  /* save the context file  */
 	}
 
-	done(0);
-	return 1;
+	return 0;
 }
 
 
@@ -364,7 +365,7 @@ pipeser(int i)
 		fflush(stderr);
 	}
 
-	done(1);
+	exit(1);
 	/* NOTREACHED */
 }