X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frepl.c;h=3c9e483da71aff64e52f580fafbcb2086c4396c0;hb=d4f5f9d551c05931478fcdfb5cd4ac06b419eeda;hp=4e2c18ae1a9846de80e4bad84bf0bcd4e5e758de;hpb=67411b1f95d6ec987b4c732459e1ba8a8ac192c6;p=mmh

diff --git a/uip/repl.c b/uip/repl.c
index 4e2c18a..3c9e483 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -149,12 +149,12 @@ main(int argc, char **argv)
 	struct msgs *mp = NULL;
 	FILE *in;
 
-	filter = getcpy(etcpath(mhlreply));
-
 #ifdef MHE
 	int buildsw = 0;
 #endif /* MHE */
 
+	filter = getcpy(etcpath(mhlreply));
+
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
 #endif
@@ -424,7 +424,7 @@ replout(FILE *inb, char *msg, char *drft, struct msgs *mp,
 	umask(mask);
 
 	/* get new format string */
-	cp = new_fs(form, NULL, NULL);
+	cp = new_fs(form, NULL);
 	format_len = strlen(cp);
 
 	/* compile format string */
@@ -594,9 +594,13 @@ finished:
 		/* add an attachment header */
 		char buffer[BUFSIZ];
 
-		snprintf(buffer, sizeof buffer, "+%s %s",
-				mp->foldpath, m_name(mp->lowsel));
-		annotate(drft, attach_hdr, buffer, 0, -2, 1);
+		snprintf(buffer, sizeof buffer, "anno -append -nodate '%s' "
+				"-comp '%s' -text '+%s %s'",
+				drft,
+				attach_hdr, mp->foldpath, m_name(mp->lowsel));
+		if (system(buffer) != 0) {
+			advise(NULL, "unable to add attachment header");
+		}
 	}
 
 	/* return dynamically allocated buffers */
@@ -755,16 +759,14 @@ insert(struct mailname *np)
 
 
 /*
-** Call the mhlproc
+** Call mhl
 **
 ** This function expects that argument out has been fflushed by the caller.
 */
-
 static void
 replfilter(FILE *in, FILE *out, char *filter)
 {
-	int pid;
-	char *mhl;
+	int pid, n;
 	char *errstr;
 
 	if (filter == NULL)
@@ -773,8 +775,6 @@ replfilter(FILE *in, FILE *out, char *filter)
 	if (access(filter, R_OK) == NOTOK)
 		adios(filter, "unable to read");
 
-	mhl = mhbasename(mhlproc);
-
 	rewind(in);
 	lseek(fileno(in), (off_t) 0, SEEK_SET);
 
@@ -785,19 +785,19 @@ replfilter(FILE *in, FILE *out, char *filter)
 	case OK:
 		dup2(fileno(in), fileno(stdin));
 		dup2(fileno(out), fileno(stdout));
-		closefds(3);
+		for (n=3; n<OPEN_MAX; n++) {
+			close(n);
+		}
 
-		execlp(mhlproc, mhl, "-form", filter, "-noclear", NULL);
+		execlp("mhl", "mhl", "-form", filter, NULL);
 		errstr = strerror(errno);
-		write(2, "unable to exec ", 15);
-		write(2, mhlproc, strlen(mhlproc));
-		write(2, ": ", 2);
+		write(2, "unable to exec mhl: ", 20);
 		write(2, errstr, strlen(errstr));
 		write(2, "\n", 1);
 		_exit(-1);
 
 	default:
-		if (pidXwait(pid, mhl))
+		if (pidXwait(pid, "mhl"))
 			done(1);
 		fseek(out, 0L, SEEK_END);
 		break;