X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frmm.c;h=5059383d74c135b8d77b51700f4504e89111df18;hp=9401d2bea85bf4f1d9e6652e1f75f60f52dc690e;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=fede6e42d81ce34fd5c1bbe7fb2757b281c2573a

diff --git a/uip/rmm.c b/uip/rmm.c
index 9401d2b..5059383 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
@@ -21,6 +24,7 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
 
 int
 main(int argc, char **argv)
@@ -31,7 +35,6 @@ main(int argc, char **argv)
 	char **arguments;
 	struct msgs_array msgs = { 0, 0, NULL };
 	struct msgs *mp;
-	pid_t pid;
 
 	setlocale(LC_ALL, "");
 	invo_name = mhbasename(argv[0]);
@@ -47,17 +50,17 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				exit(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);
-				exit(0);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 			case VERSIONSW:
 				print_version(invo_name);
-				exit(0);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 
 			case UNLINKSW:
 				unlink_msgs++;
@@ -69,9 +72,9 @@ 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));
+				folder = mh_xstrdup(expandfol(cp));
 			}
 		} else {
 			app_msgarg(&msgs, cp);
@@ -87,15 +90,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
@@ -104,8 +107,7 @@ main(int argc, char **argv)
 	*/
 	for (msgnum = 0; msgnum < msgs.size; msgnum++) {
 		if (!m_convert(mp, msgs.msgs[msgnum])) {
-			/* sysexits EX_USAGE */
-			exit(1);
+			exit(EX_USAGE);
 		}
 	}
 
@@ -127,10 +129,10 @@ 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));
+	vec = mh_xcalloc(msgs.size + 6, sizeof(*vec));
 	vec[vecp++] = "refile";
 	vec[vecp++] = "-src";
 	vec[vecp++] = concat("+", folder, NULL);
@@ -141,20 +143,5 @@ main(int argc, char **argv)
 	}
 	vec[vecp] = NULL;
 
-	fflush(stdout);
-	switch (pid = fork()) {
-	case -1:
-		adios("fork", "unable to");
-
-	case 0:
-		execvp(*vec, vec);
-		fprintf(stderr, "unable to exec ");
-		perror(*vec);
-		_exit(-1);
-
-	default:
-		pidwait(pid, -1);
-	}
-
-	return 0;
+	return execprog(*vec, vec);
 }