X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhlist.c;fp=uip%2Fmhlist.c;h=8c7e51d2cc0075af7c63d5fa659b8cc346b104ec;hp=c66b7cfe6d7ceea96eb674fc95e75da0d62bc28d;hb=fede6e42d81ce34fd5c1bbe7fb2757b281c2573a;hpb=c62aa648e80ae81ac4aa354ab15783c8fb172514

diff --git a/uip/mhlist.c b/uip/mhlist.c
index c66b7cf..8c7e51d 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -73,7 +73,7 @@ void list_all_messages(CT *, int, int);
 /* mhfree.c */
 void free_content(CT);
 extern CT *cts;
-void freects_done(int) NORETURN;
+void freects_done();
 
 /*
 ** static prototypes
@@ -92,7 +92,7 @@ main(int argc, char **argv)
 	struct msgs *mp = NULL;
 	CT ct, *ctp;
 
-	done=freects_done;
+	atexit(freects_done);
 
 	setlocale(LC_ALL, "");
 	invo_name = mhbasename(argv[0]);
@@ -111,17 +111,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 == '-')
@@ -219,9 +219,12 @@ main(int argc, char **argv)
 			adios(NULL, "no messages in %s", folder);
 
 		/* 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);
+		for (msgnum = 0; msgnum < msgs.size; msgnum++) {
+			if (!m_convert(mp, msgs.msgs[msgnum])) {
+				/* sysexits.h EX_USAGE */
+				exit(1);
+			}
+		}
 		seq_setprev(mp);  /* set the previous-sequence */
 
 		if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1),
@@ -241,7 +244,7 @@ main(int argc, char **argv)
 	}
 
 	if (!*cts)
-		done(1);
+		exit(1);
 
 	userrs = 1;
 	SIGNAL(SIGQUIT, quitser);
@@ -282,8 +285,7 @@ main(int argc, char **argv)
 		context_save();  /* save the context file  */
 	}
 
-	done(0);
-	return 1;
+	return 0;
 }
 
 
@@ -297,6 +299,6 @@ pipeser(int i)
 		fflush(stderr);
 	}
 
-	done(1);
+	exit(1);
 	/* NOTREACHED */
 }