X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=13ae761486894030e6e20d6d9f018e9d70884a4e;hb=f9ed40f2742263b3a1023bedee4139b4b18f0a86;hp=3c2db0ea222c00d9b75ee0725ec23bdea61bdd0c;hpb=04e93dabf152cc30d0aeb043d65f911ef765a176;p=mmh

diff --git a/uip/send.c b/uip/send.c
index 3c2db0e..13ae761 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -237,8 +237,7 @@ main(int argc, char **argv)
 static int
 sendsbr(char **vec, int vecp, char *drft, struct stat *st)
 {
-	int status;
-	char buffer[BUFSIZ];
+	int status, dupfd;
 	char *original_draft;
 
 	/*
@@ -290,23 +289,23 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st)
 	}
 
 	done=armed_done;
-	switch (setjmp(env)) {
-	case OK:
+	if (setjmp(env) == 0) {
 		status = sendaux(vec, vecp, drft, st) ? NOTOK : OK;
 		if (status == OK) {
 			/* move original draft to +trash folder */
-			snprintf(buffer, sizeof buffer,
-					"</dev/null refile -file %s +trash",
-					original_draft);
-			if (system(buffer) != 0) {
+			/* temporary close stdin, for refile not to ask */
+			dupfd = dup(0);
+			close(0);
+			if (execprogl("refile", "refile", "-file",
+					original_draft, "+trash",
+					(char *)NULL) != 0) {
 				advise(NULL, "unable to trash the draft");
 			}
+			dup2(dupfd, 0);
+			close(dupfd);
 		}
-		break;
-
-	default:
+	} else {
 		status = DONE;
-		break;
 	}
 
 	done=exit;
@@ -675,7 +674,7 @@ anno(struct stat *st)
 	char *msgs, *folder;
 	char buf[BUFSIZ];
 	char *vec[MAXARGS];
-	int vecp;
+	int vecp = 0;
 	char *cp, *dp;
 
 	if (altmsg && (stat(altmsg, &st2) == NOTOK ||