X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhmail.c;h=2ab9cfd96b0c14fae712f8d495730c474e0ebee8;hp=033c63498772b496f9245f07091a9761efefbb8a;hb=d5b5e6e4813b7fd77dc1664df4304537f3002cf3;hpb=3b91e463fc7a4db9e7b69e2e0f4f7909339beea5

diff --git a/uip/mhmail.c b/uip/mhmail.c
index 033c634..2ab9cfd 100644
--- a/uip/mhmail.c
+++ b/uip/mhmail.c
@@ -10,6 +10,8 @@
 #include <h/signals.h>
 #include <h/utils.h>
 #include <signal.h>
+#include <fcntl.h>
+
 
 static struct swit switches[] = {
 #define BODYSW  0
@@ -36,14 +38,15 @@ static char tmpfil[BUFSIZ];
 /*
 ** static prototypes
 */
-static RETSIGTYPE intrser(int);
+static void intrser(int);
 
 
 int
 main(int argc, char **argv)
 {
 	pid_t child_id;
-	int status, i, iscc = 0, nvec;
+	int status, iscc = 0, nvec;
+	unsigned int i;
 	int queued = 0, resent = 0, somebody;
 	char *cp, *tolist = NULL, *cclist = NULL, *subject = NULL;
 	char *from = NULL, *body = NULL, **argp, **arguments;
@@ -175,38 +178,43 @@ main(int argc, char **argv)
 	if ((child_id = fork()) == NOTOK) {
 		/* report failure and then send it */
 		adios(NULL, "unable to fork");
-	} else if (child_id) {
+
+	} else if (child_id == 0) {
+		/* child process */
+		execvp(*vec, vec);
+		fprintf(stderr, "unable to exec ");
+		perror(*vec);
+		_exit(-1);
+
+	} 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");
-			execl("/bin/mv", "mv", tmpfil, "dead.letter", NULL);
-			execl("/usr/bin/mv", "mv", tmpfil, "dead.letter",
-					NULL);
-			perror("mv");
-			_exit(-1);
 		}
 		unlink(tmpfil);
 		done(status ? 1 : 0);
-	} else {
-		/* child process */
-		execvp(*vec, vec);
-		fprintf(stderr, "unable to exec ");
-		perror(*vec);
-		_exit(-1);
 	}
 
 	return 0;  /* dead code to satisfy the compiler */
 }
 
 
-static RETSIGTYPE
+static void
 intrser(int i)
 {
-#ifndef RELIABLE_SIGNALS
-	if (i)
-		SIGNAL(i, SIG_IGN);
-#endif
-
 	unlink(tmpfil);
 	done(i != 0 ? 1 : 0);
 }