X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frmm.c;h=520ce036d92026fec8eb00fd3a6a232c45d9a9c1;hb=2abb9a7cfb0930e27062088734d306e7d78e4cc2;hp=33ae9dad400d459635156be358deada291111654;hpb=25e91f307475ef5b7e60b882299e0208398389c2;p=mmh

diff --git a/uip/rmm.c b/uip/rmm.c
index 33ae9da..520ce03 100644
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -8,6 +8,8 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define UNLINKSW  0
@@ -46,17 +48,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\n", 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 UNLINKSW:
 				unlink_msgs++;
@@ -103,7 +105,8 @@ main(int argc, char **argv)
 	*/
 	for (msgnum = 0; msgnum < msgs.size; msgnum++) {
 		if (!m_convert(mp, msgs.msgs[msgnum])) {
-			done(1);
+			/* sysexits EX_USAGE */
+			exit(1);
 		}
 	}
 
@@ -116,8 +119,7 @@ main(int argc, char **argv)
 		seq_setprev(mp);
 		seq_save(mp);
 		folder_free(mp);
-		done(0);
-		return 1;
+		return 0;
 	}
 
 	/* remove by refiling. */
@@ -139,7 +141,6 @@ main(int argc, char **argv)
 		vec[vecp++] = msgs.msgs[msgnum];
 	}
 	vec[vecp] = NULL;
-	done(execprog(*vec, vec));
 
-	return 1;  /* just in case ... */
+	return execprog(*vec, vec);
 }