X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhtest.c;h=aa7e411e195c9e313d580ca48219c1a375b7ec70;hb=55eda7c77fdf33b0a7175968471df55e2600379c;hp=1c1684f444b893059a6e99a4c6f8e1176487eea9;hpb=ccf4f175ef4c4e7522f9510a4a1149c15d810dd9;p=mmh

diff --git a/uip/mhtest.c b/uip/mhtest.c
index 1c1684f..aa7e411 100644
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -75,7 +75,7 @@ void flush_errors(void);
 /* mhfree.c */
 void free_content(CT);
 extern CT *cts;
-void freects_done(int) NORETURN;
+void freects_done();
 
 /*
 ** static prototypes
@@ -95,7 +95,9 @@ main(int argc, char **argv)
 	struct msgs *mp = NULL;
 	CT ct, *ctp;
 
-	done=freects_done;
+	if (atexit(freects_done) != 0) {
+		adios(NULL, "atexit failed");
+	}
 
 	setlocale(LC_ALL, "");
 	invo_name = mhbasename(argv[0]);
@@ -114,17 +116,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 PARTSW:
 				if (!(cp = *argp++) || *cp == '-')
@@ -233,7 +235,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),
@@ -253,7 +255,7 @@ main(int argc, char **argv)
 	}
 
 	if (!*cts)
-		done(1);
+		exit(1);
 
 	userrs = 1;
 	SIGNAL(SIGQUIT, quitser);
@@ -294,8 +296,7 @@ main(int argc, char **argv)
 		context_save();  /* save the context file  */
 	}
 
-	done(0);
-	return 1;
+	return 0;
 }
 
 
@@ -324,6 +325,6 @@ pipeser(int i)
 		fflush(stderr);
 	}
 
-	done(1);
+	exit(1);
 	/* NOTREACHED */
 }