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

diff --git a/uip/rmm.c b/uip/rmm.c
index 33ae9da..f99dcbc 100644
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -8,6 +8,9 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define UNLINKSW  0
@@ -46,17 +49,17 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				exit(EX_USAGE);
 			case UNKWNSW:
-				adios(NULL, "-%s unknown\n", cp);
+				adios(EX_USAGE, 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(argc == 2 ? EX_OK : EX_USAGE);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 
 			case UNLINKSW:
 				unlink_msgs++;
@@ -68,7 +71,7 @@ main(int argc, char **argv)
 		}
 		if (*cp == '+' || *cp == '@') {
 			if (folder) {
-				adios(NULL, "only one folder at a time!");
+				adios(EX_USAGE, NULL, "only one folder at a time!");
 			} else {
 				folder = getcpy(expandfol(cp));
 			}
@@ -86,15 +89,15 @@ main(int argc, char **argv)
 	maildir = toabsdir(folder);
 
 	if (chdir(maildir) == NOTOK) {
-		adios(maildir, "unable to change directory to");
+		adios(EX_OSERR, maildir, "unable to change directory to");
 	}
 
 	/* read folder and create message structure */
 	if (!(mp = folder_read(folder))) {
-		adios(NULL, "unable to read folder %s", folder);
+		adios(EX_IOERR, NULL, "unable to read folder %s", folder);
 	}
 	if (mp->nummsg == 0) {
-		adios(NULL, "no messages in %s", folder);
+		adios(EX_DATAERR, NULL, "no messages in %s", folder);
 	}
 	/*
 	** parse all the message ranges/sequences and set SELECTED
@@ -103,7 +106,7 @@ main(int argc, char **argv)
 	*/
 	for (msgnum = 0; msgnum < msgs.size; msgnum++) {
 		if (!m_convert(mp, msgs.msgs[msgnum])) {
-			done(1);
+			exit(EX_USAGE);
 		}
 	}
 
@@ -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. */
@@ -126,7 +128,7 @@ main(int argc, char **argv)
 	fflush(stdout);
 
 	if (msgs.size+6 > MAXARGS) {
-		adios(NULL, "more than %d messages for refile exec",
+		adios(EX_SOFTWARE, NULL, "more than %d messages for refile exec",
 				MAXARGS - 6);
 	}
 	vec = (char **)mh_xmalloc((size_t)(msgs.size + 6) * sizeof(*vec));
@@ -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);
 }