X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frepl.c;h=b0956fcbd4b6667e6f616f4e7510ed4acffed132;hp=1a0e1430d881b0ea59eaf9d59446ab85d060b384;hb=ee4f43cf2ef0084ec698e4e87159a94c01940622;hpb=88a0787554de9c618e657c31940e734178a25730

diff --git a/uip/repl.c b/uip/repl.c
index 1a0e143..b0956fc 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -47,20 +47,16 @@ static struct swit switches[] = {
 	{ "noquery", 0 },
 #define WHATSW  15
 	{ "whatnowproc program", 0 },
-#define NWHATSW  16
-	{ "nowhatnowproc", 0 },
-#define VERSIONSW  17
+#define VERSIONSW  16
 	{ "version", 0 },
-#define HELPSW  18
+#define HELPSW  17
 	{ "help", 0 },
-#define FILESW  19
+#define FILESW  18
 	{ "file file", 4 },  /* interface from msh */
-
 #ifdef MHE
-#define BILDSW  20
+# define BILDSW  19
 	{ "build", 5 },  /* interface from mhe */
 #endif
-
 	{ NULL, 0 }
 };
 
@@ -101,7 +97,7 @@ static int dftype=0;
 static char *badaddrs = NULL;
 static char *dfhost = NULL;
 
-static struct mailname mq = { NULL };
+static struct mailname mq;
 
 static struct format *fmt;
 
@@ -133,7 +129,7 @@ static char *addrcomps[] = {
 static void docc(char *, int);
 static int insert(struct mailname *);
 static void replfilter(FILE *, FILE *, char *);
-static void replout(FILE *, char *, char *, struct msgs *, int,
+static void replout(FILE *, char *, struct msgs *, int,
 		char *, char *);
 
 
@@ -141,7 +137,7 @@ int
 main(int argc, char **argv)
 {
 	int anot = 0;
-	int nedit = 0, nwhat = 0;
+	int nedit = 0;
 	char *cp, *cwd, *maildir, *file = NULL;
 	char *folder = NULL, *msg = NULL;
 	char *ed = NULL, drft[BUFSIZ], buf[BUFSIZ];
@@ -149,12 +145,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
@@ -225,15 +221,12 @@ main(int argc, char **argv)
 						*whatnowproc == '-')
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
-				nwhat = 0;
 				continue;
 #ifdef MHE
 			case BILDSW:
 				buildsw++;  /* fall... */
-#endif /* MHE */
-			case NWHATSW:
-				nwhat++;
 				continue;
+#endif /* MHE */
 
 			case FILESW:
 				if (file)
@@ -360,10 +353,10 @@ main(int argc, char **argv)
 			form = etcpath(replcomps);
 	}
 
-	replout(in, msg, drft, mp, mime, form, filter);
+	replout(in, drft, mp, mime, form, filter);
 	fclose(in);
 
-	if (nwhat)
+	if (buildsw)
 		done(0);
 	what_now(ed, nedit, NOUSE, drft, msg, 0, mp, anot ? "Replied" : NULL,
 			cwd);
@@ -403,7 +396,7 @@ docc(char *cp, int ccflag)
 
 
 static void
-replout(FILE *inb, char *msg, char *drft, struct msgs *mp,
+replout(FILE *inb, char *drft, struct msgs *mp,
 	int mime, char *form, char *filter)
 {
 	register int state, i;
@@ -594,9 +587,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, 0);
+		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 */
@@ -741,30 +738,22 @@ insert(struct mailname *np)
 		snprintf(buffer, sizeof(buffer), "Reply to %s? ",
 				adrformat(np));
 		if (!gans(buffer, anoyes))
-		return 0;
+			return 0;
 	}
 	mp->m_next = np;
-
-#ifdef ISI
-	if (ismymbox(np))
-		ccme = 0;
-#endif
-
 	return 1;
 }
 
 
 /*
-** 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 +762,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 +772,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, 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;