X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/59620a0948c8b5a2782400580d1487fb4b9b8d39..1c570cbefde061bf4aee1d0ab99bebb9fab40846:/uip/replsbr.c

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 21170376..a7a214bf 100644
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -71,9 +71,9 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
     struct format *fmt;
     register char **ap;
     int	char_read = 0, format_len, mask;
-    char name[NAMESZ], *scanl;
-    unsigned char *cp;
+    char name[NAMESZ], *scanl, *cp;
     static int dat[5];			/* aux. data for format routine */
+    m_getfld_state_t gstate = 0;
     struct fmt_callbacks cb;
 
     FILE *out;
@@ -134,8 +134,9 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
     /*
      * pick any interesting stuff out of msg "inb"
      */
-    for (state = FLD;;) {
-	state = m_getfld (state, name, tmpbuf, sizeof(tmpbuf), inb);
+    for (;;) {
+	int msg_count = sizeof tmpbuf;
+	state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
 	switch (state) {
 	    case FLD: 
 	    case FLDPLUS: 
@@ -150,15 +151,17 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 		if (i != -1) {
 		    char_read += msg_count;
 		    while (state == FLDPLUS) {
-		    	state = m_getfld(state, name, tmpbuf,
-					 sizeof(tmpbuf), inb);
+			msg_count= sizeof tmpbuf;
+			state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
 			fmt_appendcomp(i, name, tmpbuf);
 			char_read += msg_count;
 		    }
 		}
 
-		while (state == FLDPLUS)
-		    state = m_getfld (state, name, tmpbuf, SBUFSIZ, inb);
+		while (state == FLDPLUS) {
+		    msg_count= sizeof tmpbuf;
+		    state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
+		}
 		break;
 
 	    case LENERR: 
@@ -176,6 +179,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
      * format and output the header lines.
      */
 finished:
+    m_getfld_state_destroy (&gstate);
 
     /*
      * if there's a "Subject" component, strip any "Re:"s off it
@@ -185,7 +189,7 @@ finished:
 	register char *sp = cp;
 
 	for (;;) {
-	    while (isspace(*cp))
+	    while (isspace((unsigned char) *cp))
 		cp++;
 	    if(uprf(cp, "re:"))
 		cp += 3;
@@ -413,7 +417,8 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
     int	pid;
     char *mhl;
     char *errstr;
-    char *arglist[7];
+    char **arglist;
+    int argnum;
 
     if (filter == NULL)
 	return;
@@ -421,12 +426,10 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
     if (access (filter, R_OK) == NOTOK)
 	adios (filter, "unable to read");
 
-    mhl = r1bindex (mhlproc, '/');
-
     rewind (in);
     lseek (fileno(in), (off_t) 0, SEEK_SET);
 
-    switch (pid = vfork()) {
+    switch (pid = fork()) {
 	case NOTOK: 
 	    adios ("fork", "unable to");
 
@@ -435,26 +438,29 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
 	    dup2 (fileno (out), fileno (stdout));
 	    closefds (3);
 
-	    arglist[0] = mhl;
-	    arglist[1] = "-form";
-	    arglist[2] = filter;
-	    arglist[3] = "-noclear";
+	    /*
+	     * We're not allocating the memory for the extra arguments,
+	     * because we never call arglist_free().  But if we ever change
+	     * that be sure to use getcpy() for the extra arguments.
+	     */
+	    arglist = argsplit(mhlproc, &mhl, &argnum);
+	    arglist[argnum++] = "-form";
+	    arglist[argnum++] = filter;
+	    arglist[argnum++] = "-noclear";
 
 	    switch (fmtproc) {
 	    case 1:
-		arglist[4] = "-fmtproc";
-		arglist[5] = formatproc;
-		arglist[6] = NULL;
+		arglist[argnum++] = "-fmtproc";
+		arglist[argnum++] = formatproc;
 		break;
 	    case 0:
-	    	arglist[4] = "-nofmtproc";
-		arglist[5] = NULL;
+	    	arglist[argnum++] = "-nofmtproc";
 		break;
-	    default:
-	    	arglist[4] = NULL;
 	    }
 
-	    execvp (mhlproc, arglist);
+	    arglist[argnum++] = NULL;
+
+	    execvp (mhl, arglist);
 	    errstr = strerror(errno);
 	    write(2, "unable to exec ", 15);
 	    write(2, mhlproc, strlen(mhlproc));