X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhshow.c;h=e56b6120da46eae46aa88b03fa037736e2857495;hp=0b49b7e887273c10a7c7def006d5b2fa3c430b96;hb=1201af682c2a7e34d4d598e62718306b885a187e;hpb=ccf4f175ef4c4e7522f9510a4a1149c15d810dd9

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 0b49b7e..e56b612 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -75,7 +75,7 @@ void show_all_messages(CT *);
 /* mhfree.c */
 void free_content(CT);
 extern CT *cts;
-void freects_done(int) NORETURN;
+void freects_done();
 
 /*
 ** static prototypes
@@ -98,7 +98,9 @@ main(int argc, char **argv)
 	FILE *fp;
 	int ontty = 0;
 
-	done=freects_done;
+	if (atexit(freects_done) != 0) {
+		adios(NULL, "atexit failed");
+	}
 
 	setlocale(LC_ALL, "");
 	invo_name = mhbasename(argv[0]);
@@ -122,17 +124,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] %s[switches]", invo_name, mode==SHOW ? "[msgs] " : "");
 				print_help(buf, switches, 1);
-				done(1);
+				exit(0);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(0);
 
 			case PARTSW:
 				if (!(cp = *argp++) || *cp == '-')
@@ -284,7 +287,8 @@ 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);
+				/* sysexits.h EX_USAGE */
+				exit(1);
 
 		/*
 		** Set the SELECT_UNSEEN bit for all the SELECTED messages,
@@ -318,7 +322,7 @@ main(int argc, char **argv)
 	}
 
 	if (!*cts)
-		done(1);
+		exit(1);
 
 	userrs = 1;
 	SIGNAL(SIGQUIT, quitser);
@@ -367,8 +371,7 @@ main(int argc, char **argv)
 		context_save();                    /* save the context file */
 	}
 
-	done(0);
-	return 1;
+	return 0;
 }
 
 
@@ -382,7 +385,7 @@ pipeser(int i)
 		fflush(stderr);
 	}
 
-	done(1);
+	exit(1);
 	/* NOTREACHED */
 }