From: markus schnalke <meillo@marmaro.de>
Date: Fri, 23 Mar 2012 09:27:18 +0000 (+0100)
Subject: mhmail: If spost fails, preseverve draft by hand, not with mv(1).
X-Git-Tag: mmh-thesis-end~220
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=9bc048fdbfba0a5330b5b447e4f4c8c8b11ee7be;p=mmh

mhmail: If spost fails, preseverve draft by hand, not with mv(1).
---

diff --git a/uip/mhmail.c b/uip/mhmail.c
index 033c634..ef1a050 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
@@ -175,24 +177,34 @@ 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 */