X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhmail.c;h=06630b3bce882711d03b8eed3d2b6c73f065a44f;hp=7e170a8b4e51d0d8eda916f1d6d18a3e2fca7682;hb=18591f8e001ecedbee48a51c1d1f08ebaa1c15c8;hpb=32d4f9daaa70519be3072479232ff7be0500d009

diff --git a/uip/mhmail.c b/uip/mhmail.c
index 7e170a8..06630b3 100644
--- a/uip/mhmail.c
+++ b/uip/mhmail.c
@@ -11,7 +11,10 @@
 #include <h/utils.h>
 #include <signal.h>
 #include <fcntl.h>
-
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define BODYSW  0
@@ -40,7 +43,6 @@ static void intrser(int);
 int
 main(int argc, char **argv)
 {
-	pid_t child_id;
 	int status, iscc = 0, nvec;
 	char *cp, *tolist = NULL, *cclist = NULL, *subject = NULL;
 	char *from = NULL, *body = NULL, **argp, **arguments;
@@ -53,7 +55,7 @@ main(int argc, char **argv)
 
 	/* Without arguments, exit. */
 	if (argc == 1) {
-		adios(NULL, "no interactive mail shell. Use inc/scan/show instead.");
+		adios(EX_USAGE, NULL, "no interactive mail shell. Use inc/scan/show instead.");
 	}
 
 	context_read();
@@ -66,29 +68,29 @@ 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", cp);
+				adios(EX_USAGE, NULL, "-%s unknown", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf),
 						"%s addrs... [switches]",
 						invo_name);
 				print_help(buf, switches, 0);
-				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 FROMSW:
 				if (!(from = *argp++) || *from == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
 
 			case BODYSW:
 				if (!(body = *argp++) || *body == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
 
@@ -98,25 +100,25 @@ main(int argc, char **argv)
 
 			case SUBJSW:
 				if (!(subject = *argp++) || *subject == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
 			}
 		}
 		if (iscc)
 			cclist = cclist ? add(cp, add(", ", cclist)) :
-					getcpy(cp);
+					mh_xstrdup(cp);
 		else
 			tolist = tolist ? add(cp, add(", ", tolist)) :
-					getcpy(cp);
+					mh_xstrdup(cp);
 	}
 
 	if (tolist == NULL)
-		adios(NULL, "usage: %s addrs ... [switches]", invo_name);
+		adios(EX_USAGE, NULL, "usage: %s addrs ... [switches]", invo_name);
 
 	tfile = m_mktemp2("/tmp/", invo_name, NULL, &out);
 	if (tfile == NULL)
-		adios("mhmail", "unable to create temporary file");
+		adios(EX_CANTCREAT, "mhmail", "unable to create temporary file");
 	chmod(tfile, 0600);
 	strncpy(tmpfil, tfile, sizeof(tmpfil));
 
@@ -145,12 +147,12 @@ main(int argc, char **argv)
 			}
 			empty = 0;
 			if (fputs(buf, out) == EOF) {
-				adios(tmpfil, "error writing");
+				adios(EX_IOERR, tmpfil, "error writing");
 			}
 		}
 		if (empty) {
 			unlink(tmpfil);
-			adios(NULL, "not sending message with empty body");
+			adios(EX_DATAERR, NULL, "not sending message with empty body");
 		}
 	}
 	fclose(out);
@@ -160,40 +162,24 @@ main(int argc, char **argv)
 	vec[nvec++] = tmpfil;
 	vec[nvec] = NULL;
 
-	if ((child_id = fork()) == NOTOK) {
-		/* report failure and then send it */
-		adios(NULL, "unable to fork");
-
-	} else if (child_id == 0) {
-		/* child process */
-		execvp(*vec, vec);
-		fprintf(stderr, "unable to exec ");
-		perror(*vec);
-		_exit(-1);
+	if ((status = execprog(*vec, vec))) {
+		/* spost failed, save draft as dead.letter */
+		int in, out;
 
-	} else {
-		/* parent process */
-		if ((status = pidXwait(child_id, *vec))) {
-			/* spost failed, save draft as dead.letter */
-			int in, out;
-
-			in = open(tmpfil, O_RDONLY);
-			out = creat("dead.letter", 0600);
-			if (in == -1 || out == -1) {
-				fprintf(stderr, "Letter left at %s.\n",
-						tmpfil);
-				done(status ? 1 : 0);
-			}
-			cpydata(in, out, tmpfil, "dead.letter");
-			close(in);
-			close(out);
-			fprintf(stderr, "Letter saved in dead.letter\n");
+		in = open(tmpfil, O_RDONLY);
+		out = creat("dead.letter", 0600);
+		if (in == -1 || out == -1) {
+			fprintf(stderr, "Letter left at %s.\n",
+					tmpfil);
+			exit(status);
 		}
-		unlink(tmpfil);
-		done(status ? 1 : 0);
+		cpydata(in, out, tmpfil, "dead.letter");
+		close(in);
+		close(out);
+		fprintf(stderr, "Letter saved in dead.letter\n");
 	}
-
-	return 0;  /* dead code to satisfy the compiler */
+	unlink(tmpfil);
+	exit(status);
 }
 
 
@@ -201,6 +187,6 @@ static void
 intrser(int i)
 {
 	unlink(tmpfil);
-	done(i != 0 ? 1 : 0);
+	_exit(EX_IOERR);
 }