X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fanno.c;fp=uip%2Fanno.c;h=0483dffc201510935e70116ab12459aea5cfda30;hp=e8742385fa2475c1f704de538145c116e3627c3f;hb=fede6e42d81ce34fd5c1bbe7fb2757b281c2573a;hpb=c62aa648e80ae81ac4aa354ab15783c8fb172514

diff --git a/uip/anno.c b/uip/anno.c
index e874238..0483dff 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -86,7 +86,8 @@ 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);
 
@@ -95,10 +96,10 @@ main(int argc, char **argv)
 					"%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 DELETESW:  /* delete annotations */
 				mode = MODE_DEL;
@@ -202,7 +203,7 @@ main(int argc, char **argv)
 		else
 			annotate(file, comp, text, datesw, number,
 					append, preserve);
-		done(0);
+		exit(0);
 	}
 
 	if (!msgs.size)
@@ -223,9 +224,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);
+		}
+	}
 
 	/* annotate all the SELECTED messages */
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
@@ -243,8 +247,7 @@ main(int argc, char **argv)
 	seq_save(mp);
 	folder_free(mp);
 	context_save();
-	done(0);
-	return 1;
+	return 0;
 }
 
 static void
@@ -258,7 +261,8 @@ make_comp(unsigned char **ap)
 		fflush(stdout);
 
 		if (!fgets(buffer, sizeof buffer, stdin)) {
-			done(1);
+			/* sysexits.h EX_IOERR */
+			exit(1);
 		}
 		*ap = trimcpy(buffer);
 	}