X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/59620a0948c8b5a2782400580d1487fb4b9b8d39..2b5801d1615e48322ba25116e4fbbbf7936aec03:/uip/mhlsbr.c

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index fc0a1a10..5dbf341c 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -288,7 +288,7 @@ static unsigned int wid;
 
 static char *ovtxt;
 
-static unsigned char *onelp;
+static char *onelp;
 
 static char *parptr;
 
@@ -336,7 +336,8 @@ static void quitser (int);
 static void mhladios (char *, char *, ...);
 static void mhldone (int);
 static void m_popen (char *);
-static void filterbody (struct mcomp *, char *, int, int, FILE *);
+static void filterbody (struct mcomp *, char *, int, int, FILE *,
+                        m_getfld_state_t);
 static void compile_formatfield(struct mcomp *);
 static void compile_filterargs (void);
 
@@ -936,6 +937,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
     int state, bucket;
     struct mcomp *c1, *c2, *c3;
     char **ip, name[NAMESZ], buf[BUFSIZ];
+    m_getfld_state_t gstate = 0;
 
     compile_filterargs();
 
@@ -997,15 +999,17 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 	}
     }
 
-    for (state = FLD;;) {
-	switch (state = m_getfld (state, name, buf, sizeof(buf), fp)) {
+    for (;;) {
+	int bufsz = sizeof buf;
+	switch (state = m_getfld (&gstate, name, buf, &bufsz, fp)) {
 	    case FLD: 
 	    case FLDPLUS: 
 	        bucket = fmt_addcomptext(name, buf);
 		for (ip = ignores; *ip; ip++)
 		    if (!mh_strcasecmp (name, *ip)) {
 			while (state == FLDPLUS) {
-			    state = m_getfld (state, name, buf, sizeof(buf), fp);
+			    bufsz = sizeof buf;
+			    state = m_getfld (&gstate, name, buf, &bufsz, fp);
 			    fmt_appendcomp(bucket, name, buf);
 			}
 			break;
@@ -1027,7 +1031,8 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 		if (c1 == NULL)
 		    c1 = add_queue (&msghd, &msgtl, name, buf, 0);
 		while (state == FLDPLUS) {
-		    state = m_getfld (state, name, buf, sizeof(buf), fp);
+		    bufsz = sizeof buf;
+		    state = m_getfld (&gstate, name, buf, &bufsz, fp);
 		    c1->c_text = add (buf, c1->c_text);
 		    fmt_appendcomp(bucket, name, buf);
 		}
@@ -1060,14 +1065,15 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 		    if (dobody && !mh_strcasecmp (c1->c_name, "body")) {
 		    	if (c1->c_flags & FMTFILTER && state == BODY &&
 							formatproc != NULL) {
-			    filterbody(c1, buf, sizeof(buf), state, fp);
+			    filterbody(c1, buf, sizeof(buf), state, fp, gstate);
 			} else {
 			    holder.c_text = mh_xmalloc (sizeof(buf));
 			    strncpy (holder.c_text, buf, sizeof(buf));
 			    while (state == BODY) {
 				putcomp (c1, &holder, BODYCOMP);
-				state = m_getfld (state, name, holder.c_text,
-					    sizeof(buf), fp);
+				bufsz = sizeof buf;
+				state = m_getfld (&gstate, name, holder.c_text,
+					    &bufsz, fp);
 			    }
 			    free (holder.c_text);
 			    holder.c_text = NULL;
@@ -1081,12 +1087,14 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 				break;
 			}
 		}
+		m_getfld_state_destroy (&gstate);
 		return;
 
 	    case LENERR: 
 	    case FMTERR: 
 		advise (NULL, "format error in message %s", mname);
 		exitstat++;
+		m_getfld_state_destroy (&gstate);
 		return;
 
 	    default: 
@@ -1272,7 +1280,7 @@ static void
 putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 {
     int count, cchdr;
-    unsigned char *cp;
+    char *cp;
 
     cchdr = 0;
     lm = 0;
@@ -1310,8 +1318,8 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
     if (!(c1->c_flags & HDROUTPUT) && !(c1->c_flags & NOCOMPONENT)) {
         if (c1->c_flags & UPPERCASE)		/* uppercase component also */
 	    for (cp = (c1->c_text ? c1->c_text : c1->c_name); *cp; cp++)
-	        if (islower (*cp))
-		    *cp = toupper (*cp);
+	        if (islower ((unsigned char) *cp))
+		    *cp = toupper ((unsigned char) *cp);
 	putstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags);
 	if (flag != BODYCOMP) {
 	    putstr (": ", c1->c_flags);
@@ -1333,8 +1341,8 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 	    && !(c2->c_flags & NOCOMPONENT)) {
         if (c1->c_flags & UPPERCASE)
 	    for (cp = c2->c_name; *cp; cp++)
-	        if (islower (*cp))
-		    *cp = toupper (*cp);
+	        if (islower ((unsigned char) *cp))
+		    *cp = toupper ((unsigned char) *cp);
 	putstr (c2->c_name, c1->c_flags);
 	putstr (": ", c1->c_flags);
 	if (!(c1->c_flags & SPLIT))
@@ -1347,8 +1355,8 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
     }
     if (c1->c_flags & UPPERCASE)
 	for (cp = c2->c_text; *cp; cp++)
-	    if (islower (*cp))
-		*cp = toupper (*cp);
+	    if (islower ((unsigned char) *cp))
+		*cp = toupper ((unsigned char) *cp);
 
     count = 0;
     if (cchdr) {
@@ -1395,7 +1403,7 @@ oneline (char *stuff, long flags)
     term = 0;
     if (flags & COMPRESS) {
 	for (spc = 1, cp = ret; *onelp; onelp++)
-	    if (isspace (*onelp)) {
+	    if (isspace ((unsigned char) *onelp)) {
 		if (*onelp == '\n' && (!onelp[1] || (flags & ADDRFMT))) {
 		    term = '\n';
 		    *onelp++ = 0;
@@ -1643,6 +1651,8 @@ static void
 m_popen (char *name)
 {
     int pd[2];
+    char *file;
+    char **arglist;
 
     if (mhl_action && (sd = dup (fileno (stdout))) == NOTOK)
 	adios ("standard output", "unable to dup()");
@@ -1650,7 +1660,7 @@ m_popen (char *name)
     if (pipe (pd) == NOTOK)
 	adios ("pipe", "unable to");
 
-    switch (m_pid = vfork()) {
+    switch (m_pid = fork()) {
 	case NOTOK: 
 	    adios ("fork", "unable to");
 
@@ -1663,7 +1673,8 @@ m_popen (char *name)
 		dup2 (pd[0], fileno (stdin));
 		close (pd[0]);
 	    }
-	    execlp (name, r1bindex (name, '/'), NULL);
+	    arglist = argsplit(name, &file, NULL);
+	    execvp (file, arglist);
 	    fprintf (stderr, "unable to exec ");
 	    perror (name);
 	    _exit (-1);
@@ -1769,7 +1780,8 @@ compile_filterargs (void)
  */
 
 static void
-filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp)
+filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp,
+            m_getfld_state_t gstate)
 {
     struct mcomp holder;
     char name[NAMESZ];
@@ -1823,8 +1835,9 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp)
 	 */
 
 	while (state == BODY) {
+	    int bufsz2 = bufsz;
 	    write(fdinput[1], buf, strlen(buf));
-	    state = m_getfld(state, name, buf, bufsz, fp);
+	    state = m_getfld (&gstate, name, buf, &bufsz2, fp);
 	}
 
 	/*
@@ -1849,18 +1862,17 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp)
      */
 
     switch (filterpid = fork()) {
-        char **args;
+        char **args, *program;
 	struct arglist *a;
-	int i, dat[5], s;
+	int i, dat[5], s, argp;
 
     case 0:
     	/*
-	 * Allocate an argument array for us
+	 * Configure an argument array for us
 	 */
 
-	args = (char **) mh_xmalloc((filter_nargs + 2) * sizeof(char *));
-	args[0] = formatproc;
-	args[filter_nargs + 1] = NULL;
+	args = argsplit(formatproc, &program, &argp);
+	args[argp + filter_nargs] = NULL;
 	dat[0] = 0;
 	dat[1] = 0;
 	dat[2] = 0;
@@ -1871,7 +1883,7 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp)
 	 * Pull out each argument and scan them.
 	 */
 
-	for (a = arglist_head, i = 1; a != NULL; a = a->a_next, i++) {
+	for (a = arglist_head, i = argp; a != NULL; a = a->a_next, i++) {
 	    args[i] = mh_xmalloc(BUFSIZ);
 	    fmt_scan(a->a_fmt, args[i], BUFSIZ - 1, BUFSIZ, dat, NULL);
 	    /*