X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpick.c;h=7c42b42af9d744e7ec92fad3a68b5bf6844b19f9;hp=e94c259392cb0fbb8363cb41c5c6002b2460eb61;hb=fede6e42d81ce34fd5c1bbe7fb2757b281c2573a;hpb=c62aa648e80ae81ac4aa354ab15783c8fb172514

diff --git a/uip/pick.c b/uip/pick.c
index e94c259..7c42b42 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -76,7 +76,7 @@ static int pmatches(FILE *, int, long, long);
 
 static int listsw = -1;
 
-static void putzero_done(int) NORETURN;
+static void putzero_done();
 
 int
 main(int argc, char **argv)
@@ -91,7 +91,7 @@ main(int argc, char **argv)
 	struct msgs *mp;
 	register FILE *fp;
 
-	done=putzero_done;
+	atexit(putzero_done);
 
 	setlocale(LC_ALL, "");
 	invo_name = mhbasename(argv[0]);
@@ -112,7 +112,7 @@ main(int argc, char **argv)
 			case AMBIGSW:
 				ambigsw(cp, switches);
 				listsw = 0;  /* HACK */
-				done(1);
+				exit(1);
 			case UNKWNSW:
 				adios(NULL, "-%s unknown", cp);
 
@@ -120,11 +120,11 @@ main(int argc, char **argv)
 				snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
 				print_help(buf, switches, 1);
 				listsw = 0;  /* HACK */
-				done(1);
+				exit(0);
 			case VERSIONSW:
 				print_version(invo_name);
 				listsw = 0;  /* HACK */
-				done(1);
+				exit(0);
 
 			case CCSW:
 			case DATESW:
@@ -163,7 +163,8 @@ main(int argc, char **argv)
 					adios(NULL, "too many sequences (more than %d) specified", NUMATTRS);
 
 				if (!seq_nameok(cp))
-				  done(1);
+				  /* sysexits.h EX_USAGE */
+				  exit(1);
 
 				seqs[seqp++] = cp;
 				continue;
@@ -223,7 +224,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 */
 
 	/*
@@ -238,7 +239,8 @@ main(int argc, char **argv)
 				folder);
 
 	if (!pcompile(vec, NULL))
-		done(1);
+		/* sysexits.h EX_USAGE */
+		exit(1);
 
 	lo = mp->lowsel;
 	hi = mp->hghsel;
@@ -289,7 +291,8 @@ main(int argc, char **argv)
 	*/
 	for (seqp = 0; seqs[seqp]; seqp++)
 		if (!seq_addsel(mp, seqs[seqp], publicsw, zerosw))
-			done(1);
+			/* sysexits.h EX_IOERR */
+			exit(1);
 
 	/*
 	** Print total matched if not printing each matched message number.
@@ -302,17 +305,16 @@ main(int argc, char **argv)
 	seq_save(mp);  /* synchronize message sequences */
 	context_save();  /* save the context file */
 	folder_free(mp);  /* free folder/message structure */
-	done(0);
-	return 1;
+	return 0;
 }
 
 
 static void
-putzero_done(int status)
+putzero_done()
 {
-	if (listsw && status && !isatty(fileno(stdout)))
+	if (listsw && !isatty(fileno(stdout))) {
 		printf("0\n");
-	exit(status);
+	}
 }