X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frcvstore.c;h=61a91b24f35d4dc69e35c26c5628cd44a8bedfa8;hp=bb14ed98d6e92860404fdfe84bfcecaad3fdd217;hb=2abb9a7cfb0930e27062088734d306e7d78e4cc2;hpb=ccf4f175ef4c4e7522f9510a4a1149c15d810dd9

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index bb14ed9..61a91b2 100644
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -11,6 +11,9 @@
 #include <h/signals.h>
 #include <errno.h>
 #include <signal.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define CRETSW  0
@@ -44,7 +47,7 @@ static struct swit switches[] = {
 */
 static char *tmpfilenam = NULL;
 
-static void unlink_done(int) NORETURN;
+void unlink_done();
 
 int
 main(int argc, char **argv)
@@ -58,7 +61,9 @@ main(int argc, char **argv)
 	struct msgs *mp;
 	struct stat st;
 
-	done=unlink_done;
+	if (atexit(unlink_done) != 0) {
+		adios(NULL, "atexit failed");
+	}
 
 	setlocale(LC_ALL, "");
 	invo_name = mhbasename(argv[0]);
@@ -75,7 +80,7 @@ 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);
 
@@ -84,10 +89,10 @@ main(int argc, char **argv)
 						"%s [+folder] [switches]",
 						invo_name);
 				print_help(buf, switches, 1);
-				done(1);
+				exit(1);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(1);
 
 			case SEQSW:
 				if (!(cp = *argp++) || *cp == '-')
@@ -186,7 +191,7 @@ main(int argc, char **argv)
 	if (st.st_size == 0) {
 		unlink(tmpfilenam);
 		advise(NULL, "empty file");
-		done(0);
+		exit(0);
 	}
 
 	/*
@@ -201,7 +206,7 @@ main(int argc, char **argv)
 	*/
 	if ((msgnum = folder_addmsg(&mp, tmpfilenam, 0, unseensw, 0, 0, NULL))
 			== -1)
-		done(1);
+		exit(1);
 
 	/*
 	** Add the message to any extra sequences
@@ -209,7 +214,7 @@ main(int argc, char **argv)
 	*/
 	for (seqp = 0; seqs[seqp]; seqp++) {
 		if (!seq_addmsg(mp, seqs[seqp], msgnum, publicsw, zerosw))
-			done(1);
+			exit(1);
 	}
 
 	seq_setunseen(mp, 1);  /* add new msgs to unseen sequences */
@@ -220,17 +225,16 @@ main(int argc, char **argv)
 	unlink(tmpfilenam);  /* remove temporary file */
 	tmpfilenam = NULL;
 
-	done(0);
-	return 1;
+	return 0;
 }
 
 /*
 ** Clean up and exit
 */
-static void
-unlink_done(int status)
+void
+unlink_done()
 {
-	if (tmpfilenam && *tmpfilenam)
+	if (tmpfilenam && *tmpfilenam) {
 		unlink(tmpfilenam);
-	exit(status);
+	}
 }