Look at post instead of inc to determine build options in build_nmh.

[nmh] / uip / mhlsbr.c

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index fc0a1a109a6d75cbb81a032958148ad603cf63cb..69e3f1f664de80e2fa747317c961452061362055 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -16,7 +16,6 @@
 #include <setjmp.h>
 #include <signal.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
 #include <errno.h>

-#include <sys/wait.h>

 #include <sys/types.h>
 
 /*
 #include <sys/types.h>
 
 /*


@@ -288,7 +287,7 @@ static unsigned int wid;
 
 static char *ovtxt;
 
 
 static char *ovtxt;
 

-static unsigned char *onelp;
+static char *onelp;

 
 static char *parptr;
 
 
 static char *parptr;
 


@@ -336,7 +335,8 @@ static void quitser (int);
 static void mhladios (char *, char *, ...);
 static void mhldone (int);
 static void m_popen (char *);
 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);
 
 static void compile_formatfield(struct mcomp *);
 static void compile_filterargs (void);
 


@@ -610,7 +610,7 @@ mhl_format (char *file, int length, int width)
                 * Split this list of fields to ignore, and copy
                 * it to the end of the current "ignores" list.
                 */
                 * Split this list of fields to ignore, and copy
                 * it to the end of the current "ignores" list.
                 */

-               if (!mh_strcasecmp (name, "ignores")) {
+               if (!strcasecmp (name, "ignores")) {

                    char **tmparray, **p;
                    int n = 0;
 
                    char **tmparray, **p;
                    int n = 0;
 


@@ -719,17 +719,17 @@ evalvar (struct mcomp *c1)
        return 0;
     strncpy (name, parse(), sizeof(name));
 
        return 0;
     strncpy (name, parse(), sizeof(name));
 

-    if (!mh_strcasecmp (name, "component")) {
+    if (!strcasecmp (name, "component")) {

        if (ptos (name, &c1->c_text))
            return 1;
        c1->c_flags &= ~NOCOMPONENT;
        return 0;
     }
 
        if (ptos (name, &c1->c_text))
            return 1;
        c1->c_flags &= ~NOCOMPONENT;
        return 0;
     }
 

-    if (!mh_strcasecmp (name, "overflowtext"))
+    if (!strcasecmp (name, "overflowtext"))

        return ptos (name, &c1->c_ovtxt);
 
        return ptos (name, &c1->c_ovtxt);
 

-    if (!mh_strcasecmp (name, "formatfield")) {
+    if (!strcasecmp (name, "formatfield")) {

        if (ptos (name, &cp))
            return 1;
        c1->c_nfs = getcpy (new_fs (NULL, NULL, cp));
        if (ptos (name, &cp))
            return 1;
        c1->c_nfs = getcpy (new_fs (NULL, NULL, cp));


@@ -738,40 +738,40 @@ evalvar (struct mcomp *c1)
        return 0;
     }
 
        return 0;
     }
 

-    if (!mh_strcasecmp (name, "decode")) {
+    if (!strcasecmp (name, "decode")) {

        c1->c_nfs = getcpy (new_fs (NULL, NULL, "%(decode{text})"));
        compile_formatfield(c1);
        c1->c_flags |= FORMAT;
        return 0;
     }
 
        c1->c_nfs = getcpy (new_fs (NULL, NULL, "%(decode{text})"));
        compile_formatfield(c1);
        c1->c_flags |= FORMAT;
        return 0;
     }
 

-    if (!mh_strcasecmp (name, "offset"))
+    if (!strcasecmp (name, "offset"))

        return ptoi (name, &c1->c_offset);
        return ptoi (name, &c1->c_offset);

-    if (!mh_strcasecmp (name, "overflowoffset"))
+    if (!strcasecmp (name, "overflowoffset"))

        return ptoi (name, &c1->c_ovoff);
        return ptoi (name, &c1->c_ovoff);

-    if (!mh_strcasecmp (name, "width"))
+    if (!strcasecmp (name, "width"))

        return ptoi (name, &c1->c_width);
        return ptoi (name, &c1->c_width);

-    if (!mh_strcasecmp (name, "compwidth"))
+    if (!strcasecmp (name, "compwidth"))

        return ptoi (name, &c1->c_cwidth);
        return ptoi (name, &c1->c_cwidth);

-    if (!mh_strcasecmp (name, "length"))
+    if (!strcasecmp (name, "length"))

        return ptoi (name, &c1->c_length);
        return ptoi (name, &c1->c_length);

-    if (!mh_strcasecmp (name, "nodashstuffing"))
+    if (!strcasecmp (name, "nodashstuffing"))

        return (dashstuff = -1);
 
     for (ap = triples; ap->t_name; ap++)
        return (dashstuff = -1);
 
     for (ap = triples; ap->t_name; ap++)

-       if (!mh_strcasecmp (ap->t_name, name)) {
+       if (!strcasecmp (ap->t_name, name)) {

            c1->c_flags |= ap->t_on;
            c1->c_flags &= ~ap->t_off;
            return 0;
        }
 
            c1->c_flags |= ap->t_on;
            c1->c_flags &= ~ap->t_off;
            return 0;
        }
 

-   if (!mh_strcasecmp (name, "formatarg")) {
+   if (!strcasecmp (name, "formatarg")) {

        struct arglist *args;
 
        if (ptos (name, &cp))
            return 1;
 
        struct arglist *args;
 
        if (ptos (name, &cp))
            return 1;
 

-       if (mh_strcasecmp (c1->c_name, "body")) {
+       if (! c1->c_name  ||  strcasecmp (c1->c_name, "body")) {

            advise (NULL, "format filters are currently only supported on "
                    "the \"body\" component");
            return 1;
            advise (NULL, "format filters are currently only supported on "
                    "the \"body\" component");
            return 1;


@@ -936,6 +936,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
     int state, bucket;
     struct mcomp *c1, *c2, *c3;
     char **ip, name[NAMESZ], buf[BUFSIZ];
     int state, bucket;
     struct mcomp *c1, *c2, *c3;
     char **ip, name[NAMESZ], buf[BUFSIZ];

+    m_getfld_state_t gstate = 0;

 
     compile_filterargs();
 
 
     compile_filterargs();
 


@@ -997,15 +998,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++)
            case FLD: 
            case FLDPLUS: 
                bucket = fmt_addcomptext(name, buf);
                for (ip = ignores; *ip; ip++)

-                   if (!mh_strcasecmp (name, *ip)) {
+                   if (!strcasecmp (name, *ip)) {

                        while (state == FLDPLUS) {
                        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;
                            fmt_appendcomp(bucket, name, buf);
                        }
                        break;


@@ -1014,12 +1017,13 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
                    continue;
 
                for (c2 = fmthd; c2; c2 = c2->c_next)
                    continue;
 
                for (c2 = fmthd; c2; c2 = c2->c_next)

-                   if (!mh_strcasecmp (c2->c_name, name))
+                   if (!strcasecmp (c2->c_name ? c2->c_name : "", name))

                        break;
                c1 = NULL;
                if (!((c3 = c2 ? c2 : &global)->c_flags & SPLIT))
                    for (c1 = msghd; c1; c1 = c1->c_next)
                        break;
                c1 = NULL;
                if (!((c3 = c2 ? c2 : &global)->c_flags & SPLIT))
                    for (c1 = msghd; c1; c1 = c1->c_next)

-                       if (!mh_strcasecmp (c1->c_name, c3->c_name)) {
+                       if (!strcasecmp (c1->c_name ? c1->c_name : "",
+                                        c3->c_name ? c3->c_name : "")) {

                            c1->c_text =
                                mcomp_add (c1->c_flags, buf, c1->c_text);
                            break;
                            c1->c_text =
                                mcomp_add (c1->c_flags, buf, c1->c_text);
                            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) {
                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);
                }
                    c1->c_text = add (buf, c1->c_text);
                    fmt_appendcomp(bucket, name, buf);
                }


@@ -1043,7 +1048,8 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
                        putcomp (c1, c1, ONECOMP);
                        continue;
                    }
                        putcomp (c1, c1, ONECOMP);
                        continue;
                    }

-                   if (!mh_strcasecmp (c1->c_name, "messagename")) {
+                   if (!c1->c_name  ||
+                       !strcasecmp (c1->c_name, "messagename")) {

                        holder.c_text = concat ("(Message ", mname, ")\n",
                                            NULL);
                        putcomp (c1, &holder, ONECOMP);
                        holder.c_text = concat ("(Message ", mname, ")\n",
                                            NULL);
                        putcomp (c1, &holder, ONECOMP);


@@ -1051,23 +1057,25 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
                        holder.c_text = NULL;
                        continue;
                    }
                        holder.c_text = NULL;
                        continue;
                    }

-                   if (!mh_strcasecmp (c1->c_name, "extras")) {
+                   if (!c1->c_name  ||  !strcasecmp (c1->c_name, "extras")) {

                        for (c2 = msghd; c2; c2 = c2->c_next)
                            if (c2->c_flags & EXTRA)
                                putcomp (c1, c2, TWOCOMP);
                        continue;
                    }
                        for (c2 = msghd; c2; c2 = c2->c_next)
                            if (c2->c_flags & EXTRA)
                                putcomp (c1, c2, TWOCOMP);
                        continue;
                    }

-                   if (dobody && !mh_strcasecmp (c1->c_name, "body")) {
+                   if (dobody && (!c1->c_name  ||
+                                  !strcasecmp (c1->c_name, "body"))) {

                        if (c1->c_flags & FMTFILTER && state == BODY &&
                                                        formatproc != NULL) {
                        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);
                        } 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;
                            }
                            free (holder.c_text);
                            holder.c_text = NULL;


@@ -1075,18 +1083,21 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
                        continue;
                    }
                    for (c2 = msghd; c2; c2 = c2->c_next)
                        continue;
                    }
                    for (c2 = msghd; c2; c2 = c2->c_next)

-                       if (!mh_strcasecmp (c2->c_name, c1->c_name)) {
+                       if (!strcasecmp (c2->c_name ? c2->c_name : "",
+                                        c1->c_name ? c1->c_name : "")) {

                            putcomp (c1, c2, ONECOMP);
                            if (!(c1->c_flags & SPLIT))
                                break;
                        }
                }
                            putcomp (c1, c2, ONECOMP);
                            if (!(c1->c_flags & SPLIT))
                                break;
                        }
                }

+               m_getfld_state_destroy (&gstate);

                return;
 
            case LENERR: 
            case FMTERR: 
                advise (NULL, "format error in message %s", mname);
                exitstat++;
                return;
 
            case LENERR: 
            case FMTERR: 
                advise (NULL, "format error in message %s", mname);
                exitstat++;

+               m_getfld_state_destroy (&gstate);

                return;
 
            default: 
                return;
 
            default: 


@@ -1102,7 +1113,7 @@ mcomp_flags (char *name)
     struct pair *ap;
 
     for (ap = pairs; ap->p_name; ap++)
     struct pair *ap;
 
     for (ap = pairs; ap->p_name; ap++)

-       if (!mh_strcasecmp (ap->p_name, name))
+       if (!strcasecmp (ap->p_name, name))

            return (ap->p_flags);
 
     return 0;
            return (ap->p_flags);
 
     return 0;


@@ -1272,7 +1283,7 @@ static void
 putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 {
     int count, cchdr;
 putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 {
     int count, cchdr;

-    unsigned char *cp;
+    char *cp;

 
     cchdr = 0;
     lm = 0;
 
     cchdr = 0;
     lm = 0;


@@ -1310,8 +1321,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 (!(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);
        putstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags);
        if (flag != BODYCOMP) {
            putstr (": ", c1->c_flags);


@@ -1333,8 +1344,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++)
            && !(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))
        putstr (c2->c_name, c1->c_flags);
        putstr (": ", c1->c_flags);
        if (!(c1->c_flags & SPLIT))


@@ -1347,8 +1358,8 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
     }
     if (c1->c_flags & UPPERCASE)
        for (cp = c2->c_text; *cp; cp++)
     }
     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) {
 
     count = 0;
     if (cchdr) {


@@ -1395,7 +1406,7 @@ oneline (char *stuff, long flags)
     term = 0;
     if (flags & COMPRESS) {
        for (spc = 1, cp = ret; *onelp; onelp++)
     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;
                if (*onelp == '\n' && (!onelp[1] || (flags & ADDRFMT))) {
                    term = '\n';
                    *onelp++ = 0;


@@ -1643,6 +1654,8 @@ static void
 m_popen (char *name)
 {
     int pd[2];
 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()");
 
     if (mhl_action && (sd = dup (fileno (stdout))) == NOTOK)
        adios ("standard output", "unable to dup()");


@@ -1650,7 +1663,7 @@ m_popen (char *name)
     if (pipe (pd) == NOTOK)
        adios ("pipe", "unable to");
 
     if (pipe (pd) == NOTOK)
        adios ("pipe", "unable to");
 

-    switch (m_pid = vfork()) {
+    switch (m_pid = fork()) {

        case NOTOK: 
            adios ("fork", "unable to");
 
        case NOTOK: 
            adios ("fork", "unable to");
 


@@ -1663,7 +1676,8 @@ m_popen (char *name)
                dup2 (pd[0], fileno (stdin));
                close (pd[0]);
            }
                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);
            fprintf (stderr, "unable to exec ");
            perror (name);
            _exit (-1);


@@ -1769,7 +1783,8 @@ compile_filterargs (void)
  */
 
 static 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];
 {
     struct mcomp holder;
     char name[NAMESZ];


@@ -1823,8 +1838,9 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp)
         */
 
        while (state == BODY) {
         */
 
        while (state == BODY) {

+           int bufsz2 = bufsz;

            write(fdinput[1], buf, strlen(buf));
            write(fdinput[1], buf, strlen(buf));

-           state = m_getfld(state, name, buf, bufsz, fp);
+           state = m_getfld (&gstate, name, buf, &bufsz2, fp);

        }
 
        /*
        }
 
        /*


@@ -1849,18 +1865,17 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp)
      */
 
     switch (filterpid = fork()) {
      */
 
     switch (filterpid = fork()) {

-        char **args;
+        char **args, *program;

        struct arglist *a;
        struct arglist *a;

-       int i, dat[5], s;
+       int i, dat[5], s, argp;

 
     case 0:
        /*
 
     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;
        dat[0] = 0;
        dat[1] = 0;
        dat[2] = 0;


@@ -1871,7 +1886,7 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp)
         * Pull out each argument and scan them.
         */
 
         * 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);
            /*
            args[i] = mh_xmalloc(BUFSIZ);
            fmt_scan(a->a_fmt, args[i], BUFSIZ - 1, BUFSIZ, dat, NULL);
            /*