X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Freplsbr.c;h=f6ccd3529bf87ee1c4ce53972e4f2010b57e85c8;hb=5e5e8b753acc7ff1e16c7fca172a2151a6c01353;hp=9ca0bb94f72dbaf7a5f296813f1b84e2751e195f;hpb=162f2a7d23a18a87cad101f68ab27de057de533d;p=mmh

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 9ca0bb9..f6ccd35 100644
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -24,7 +24,7 @@ static int dftype=0;
 static char *badaddrs = NULL;
 static char *dfhost = NULL;
 
-static struct mailname mq = { NULL };
+static struct mailname mq;
 static int nodupcheck = 0;		/* If set, no check for duplicates */
 
 /*
@@ -64,12 +64,12 @@ static char *addrcomps[] = {
  * static prototypes
  */
 static int insert (struct mailname *);
-static void replfilter (FILE *, FILE *, char *);
+static void replfilter (FILE *, FILE *, char *, int);
 
 
 void
 replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
-	int mime, char *form, char *filter, char *fcc)
+	int mime, char *form, char *filter, char *fcc, int fmtproc)
 {
     register int state, i;
     register struct comp *cptr;
@@ -81,6 +81,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
     char name[NAMESZ], *scanl;
     unsigned char *cp;
     FILE *out;
+    NMH_UNUSED (msg);
 
     mask = umask(~m_gmprot());
     if ((out = fopen (drft, "w")) == NULL)
@@ -162,9 +163,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 			if (!mh_strcasecmp(name, cptr->c_name)) {
 			    char_read += msg_count;
 			    if (! cptr->c_text) {
-				i = strlen(cptr->c_text = tmpbuf) - 1;
-				if (tmpbuf[i] == '\n')
-				    tmpbuf[i] = '\0';
+				cptr->c_text = tmpbuf;
 				*--savecomp = cptr;
 				tmpbuf = *nxtbuf++;
 			    } else {
@@ -238,7 +237,7 @@ finished:
     dat[2] = 0;
     dat[3] = outputlinelen;
     dat[4] = 0;
-    fmt_scan (fmt, scanl, i, dat);
+    fmt_scan (fmt, scanl, i + 1, i, dat);
     fputs (scanl, out);
     if (badaddrs) {
 	fputs ("\nrepl: bad addresses:\n", out);
@@ -254,7 +253,7 @@ finished:
 	if (ferror (out))
 	    adios (drft, "error writing");
 	
-	replfilter (inb, out, filter);
+	replfilter (inb, out, filter, fmtproc);
     } else if (mime && mp) {
 	    fprintf (out, "#forw [original message] +%s %s\n",
 		     mp->foldpath, m_name (mp->lowsel));
@@ -431,11 +430,6 @@ insert (struct mailname *np)
     }
     mp->m_next = np;
 
-#ifdef ISI
-    if (ismymbox (np))
-	ccme = 0;
-#endif
-
     return 1;
 }
 
@@ -447,11 +441,12 @@ insert (struct mailname *np)
  */
 
 static void
-replfilter (FILE *in, FILE *out, char *filter)
+replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
 {
     int	pid;
     char *mhl;
     char *errstr;
+    char *arglist[7];
 
     if (filter == NULL)
 	return;
@@ -464,7 +459,7 @@ replfilter (FILE *in, FILE *out, char *filter)
     rewind (in);
     lseek (fileno(in), (off_t) 0, SEEK_SET);
 
-    switch (pid = vfork ()) {
+    switch (pid = vfork()) {
 	case NOTOK: 
 	    adios ("fork", "unable to");
 
@@ -473,7 +468,26 @@ replfilter (FILE *in, FILE *out, char *filter)
 	    dup2 (fileno (out), fileno (stdout));
 	    closefds (3);
 
-	    execlp (mhlproc, mhl, "-form", filter, "-noclear", NULL);
+	    arglist[0] = mhl;
+	    arglist[1] = "-form";
+	    arglist[2] = filter;
+	    arglist[3] = "-noclear";
+
+	    switch (fmtproc) {
+	    case 1:
+		arglist[4] = "-fmtproc";
+		arglist[5] = formatproc;
+		arglist[6] = NULL;
+		break;
+	    case 0:
+	    	arglist[4] = "-nofmtproc";
+		arglist[5] = NULL;
+		break;
+	    default:
+	    	arglist[4] = NULL;
+	    }
+
+	    execvp (mhlproc, arglist);
 	    errstr = strerror(errno);
 	    write(2, "unable to exec ", 15);
 	    write(2, mhlproc, strlen(mhlproc));