X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/adc0a3232c43033729dbc036f0757bddfba463bd..39ecf70bb:/uip/mhlsbr.c?ds=inline diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index bfa06873..a4402c56 100644 --- a/uip/mhlsbr.c +++ b/uip/mhlsbr.c @@ -1,6 +1,4 @@ - -/* - * mhlsbr.c -- main routines for nmh message lister +/* mhlsbr.c -- main routines for nmh message lister * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for @@ -13,10 +11,8 @@ #include #include #include +#include "../sbr/m_popen.h" #include -#include -#include -#include #include /* @@ -25,7 +21,7 @@ * set, then addresses get split wrong (not at the spaces between commas). * To fix this correctly, putstr() should know about "atomic" strings that * must NOT be broken across lines. That's too difficult for right now - * (it turns out that there are a number of degernate cases), so in + * (it turns out that there are a number of degenerate cases), so in * oneline(), instead of * * (*onelp == '\n' && !onelp[1]) @@ -44,55 +40,38 @@ #define QUOTE '\\' -static struct swit mhlswitches[] = { -#define BELLSW 0 - { "bell", 0 }, -#define NBELLSW 1 - { "nobell", 0 }, -#define CLRSW 2 - { "clear", 0 }, -#define NCLRSW 3 - { "noclear", 0 }, -#define FOLDSW 4 - { "folder +folder", 0 }, -#define FORMSW 5 - { "form formfile", 0 }, -#define PROGSW 6 - { "moreproc program", 0 }, -#define NPROGSW 7 - { "nomoreproc", 0 }, -#define LENSW 8 - { "length lines", 0 }, -#define WIDTHSW 9 - { "width columns", 0 }, -#define SLEEPSW 10 - { "sleep seconds", 0 }, -#define BITSTUFFSW 11 - { "dashstuffing", -12 }, /* interface from forw */ -#define NBITSTUFFSW 12 - { "nodashstuffing", -14 }, /* interface from forw */ -#define VERSIONSW 13 - { "version", 0 }, -#define HELPSW 14 - { "help", 0 }, -#define FORW1SW 15 - { "forward", -7 }, /* interface from forw */ -#define FORW2SW 16 - { "forwall", -7 }, /* interface from forw */ -#define DGSTSW 17 - { "digest list", -6 }, -#define VOLUMSW 18 - { "volume number", -6 }, -#define ISSUESW 19 - { "issue number", -5 }, -#define NBODYSW 20 - { "nobody", -6 }, -#define FMTPROCSW 21 - { "fmtproc program", 0 }, -#define NFMTPROCSW 22 - { "nofmtproc", 0 }, - { NULL, 0 } -}; +#define MHL_SWITCHES \ + X("bell", 0, BELLSW) \ + X("nobell", 0, NBELLSW) \ + X("clear", 0, CLRSW) \ + X("noclear", 0, NCLRSW) \ + X("folder +folder", 0, FOLDSW) \ + X("form formfile", 0, FORMSW) \ + X("moreproc program", 0, PROGSW) \ + X("nomoreproc", 0, NPROGSW) \ + X("length lines", 0, LENSW) \ + X("width columns", 0, WIDTHSW) \ + X("sleep seconds", 0, SLEEPSW) \ + X("dashstuffing", -12, BITSTUFFSW) /* interface from forw */ \ + X("nodashstuffing", -14, NBITSTUFFSW) /* interface from forw */ \ + X("version", 0, VERSIONSW) \ + X("help", 0, HELPSW) \ + X("forward", -7, FORW1SW) /* interface from forw */ \ + X("forwall", -7, FORW2SW) /* interface from forw */ \ + X("digest list", -6, DGSTSW) \ + X("volume number", -6, VOLUMSW) \ + X("issue number", -5, ISSUESW) \ + X("nobody", -6, NBODYSW) \ + X("fmtproc program", 0, FMTPROCSW) \ + X("nofmtproc", 0, NFMTPROCSW) \ + +#define X(sw, minchars, id) id, +DEFINE_SWITCH_ENUM(MHL); +#undef X + +#define X(sw, minchars, id) { sw, minchars, id }, +DEFINE_SWITCH_ARRAY(MHL, mhlswitches); +#undef X #define NOCOMPONENT 0x000001 /* don't show component name */ #define UPPERCASE 0x000002 /* display in all upper case */ @@ -108,11 +87,14 @@ static struct swit mhlswitches[] = { #define DATEFMT 0x000800 /* contains dates */ #define FORMAT 0x001000 /* parse address/date/RFC-2047 field */ #define INIT 0x002000 /* initialize component */ +#define RTRIM 0x004000 /* trim trailing whitespace */ #define SPLIT 0x010000 /* split headers (don't concatenate) */ #define NONEWLINE 0x020000 /* don't write trailing newline */ #define NOWRAP 0x040000 /* Don't wrap lines ever */ #define FMTFILTER 0x080000 /* Filter through format filter */ -#define LBITS "\020\01NOCOMPONENT\02UPPERCASE\03CENTER\04CLEARTEXT\05EXTRA\06HDROUTPUT\07CLEARSCR\010LEFTADJUST\011COMPRESS\012ADDRFMT\013BELL\014DATEFMT\015FORMAT\016INIT\021SPLIT\022NONEWLINE\023NOWRAP\024FMTFILTER" +#define INVISIBLE 0x100000 /* count byte in display columns? */ +#define FORCE7BIT 0x200000 /* don't display 8-bit bytes */ +#define LBITS "\020\01NOCOMPONENT\02UPPERCASE\03CENTER\04CLEARTEXT\05EXTRA\06HDROUTPUT\07CLEARSCR\010LEFTADJUST\011COMPRESS\012ADDRFMT\013BELL\014DATEFMT\015FORMAT\016INIT\017RTRIM\021SPLIT\022NONEWLINE\023NOWRAP\024FMTFILTER\025INVISIBLE\026FORCE7BIT" #define GFLAGS (NOCOMPONENT | UPPERCASE | CENTER | LEFTADJUST | COMPRESS | SPLIT | NOWRAP) /* @@ -180,7 +162,7 @@ struct mcomp { int c_width; /* width of field */ int c_cwidth; /* width of component */ int c_length; /* length in lines */ - long c_flags; + unsigned long c_flags; struct mcomp *c_next; }; @@ -199,7 +181,7 @@ static struct mcomp holder = { struct pair { char *p_name; - long p_flags; + unsigned long p_flags; }; static struct pair pairs[] = { @@ -222,8 +204,8 @@ static struct pair pairs[] = { struct triple { char *t_name; - long t_on; - long t_off; + unsigned long t_on; + unsigned long t_off; }; static struct triple triples[] = { @@ -241,6 +223,8 @@ static struct triple triples[] = { { "nocompress", 0, COMPRESS }, { "split", SPLIT, 0 }, { "nosplit", 0, SPLIT }, + { "rtrim", RTRIM, 0 }, + { "nortrim", 0, RTRIM }, { "addrfield", ADDRFMT, DATEFMT }, { "bell", BELL, 0 }, { "nobell", 0, BELL }, @@ -305,7 +289,7 @@ static unsigned int wid; static char *ovtxt; -static unsigned char *onelp; +static char *onelp; static char *parptr; @@ -319,14 +303,7 @@ static char delim3[] = /* from forw.c */ "\n----------------------------------------------------------------------\n\n"; static char delim4[] = "\n------------------------------\n\n"; -static FILE *(*mhl_action) () = (FILE *(*) ()) 0; - -/* - * Redefine a couple of functions. - * These are undefined later in the code. - */ -#define adios mhladios -#define done mhldone +static FILE *(*mhl_action)(char *); /* * prototypes @@ -339,20 +316,19 @@ static char *parse (void); static void process (char *, char *, int, int); static void mhlfile (FILE *, char *, int, int); static int mcomp_flags (char *); -static char *mcomp_add (long, char *, char *); +static char *mcomp_add (unsigned long, char *, char *); static void mcomp_format (struct mcomp *, struct mcomp *); static struct mcomp *add_queue (struct mcomp **, struct mcomp **, char *, char *, int); static void free_queue (struct mcomp **, struct mcomp **); static void putcomp (struct mcomp *, struct mcomp *, int); -static char *oneline (char *, long); -static void putstr (char *, long); -static void putch (char, long); +static char *oneline (char *, unsigned long); +static void putstr (char *, unsigned long); +static void putch (char, unsigned long); static void intrser (int); static void pipeser (int); 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 *, m_getfld_state_t); static void compile_formatfield(struct mcomp *); @@ -369,11 +345,9 @@ mhl (int argc, char **argv) char buf[BUFSIZ], *files[MAXARGS]; char **argp, **arguments; + /* Need this if called from main() of show(1). */ invo_name = r1bindex (argv[0], '/'); - /* read user profile/context */ - context_read(); - arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; @@ -385,17 +359,21 @@ mhl (int argc, char **argv) switch (smatch (++cp, mhlswitches)) { case AMBIGSW: ambigsw (cp, mhlswitches); - done (1); + mhldone (1); + /* FALLTHRU */ case UNKWNSW: - adios (NULL, "-%s unknown\n", cp); + mhladios (NULL, "-%s unknown\n", cp); + /* FALLTHRU */ case HELPSW: snprintf (buf, sizeof(buf), "%s [switches] [files ...]", invo_name); print_help (buf, mhlswitches, 1); - done (0); + mhldone (0); + /* FALLTHRU */ case VERSIONSW: print_version(invo_name); - done (0); + mhldone (0); + /* FALLTHRU */ case BELLSW: bellflg = 1; @@ -413,22 +391,23 @@ mhl (int argc, char **argv) case FOLDSW: if (!(folder = *argp++) || *folder == '-') - adios (NULL, "missing argument to %s", argp[-2]); + mhladios (NULL, "missing argument to %s", argp[-2]); continue; case FORMSW: if (!(form = *argp++) || *form == '-') - adios (NULL, "missing argument to %s", argp[-2]); + mhladios (NULL, "missing argument to %s", argp[-2]); continue; case SLEEPSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - sleepsw = atoi (cp);/* ZERO ok! */ + mhladios (NULL, "missing argument to %s", argp[-2]); + else + sleepsw = atoi (cp);/* ZERO ok! */ continue; case PROGSW: if (!(moreproc = *argp++) || *moreproc == '-') - adios (NULL, "missing argument to %s", argp[-2]); + mhladios (NULL, "missing argument to %s", argp[-2]); continue; case NPROGSW: nomore++; @@ -436,7 +415,7 @@ mhl (int argc, char **argv) case FMTPROCSW: if (!(formatproc = *argp++) || *formatproc == '-') - adios (NULL, "missing argument to %s", argp[-2]); + mhladios (NULL, "missing argument to %s", argp[-2]); continue; case NFMTPROCSW: formatproc = NULL; @@ -444,46 +423,47 @@ mhl (int argc, char **argv) case LENSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - if ((length = atoi (cp)) < 1) - adios (NULL, "bad argument %s %s", argp[-2], cp); + mhladios (NULL, "missing argument to %s", argp[-2]); + else if ((length = atoi (cp)) < 1) + mhladios (NULL, "bad argument %s %s", argp[-2], cp); continue; case WIDTHSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - if ((width = atoi (cp)) < 1) - adios (NULL, "bad argument %s %s", argp[-2], cp); + mhladios (NULL, "missing argument to %s", argp[-2]); + else if ((width = atoi (cp)) < 1) + mhladios (NULL, "bad argument %s %s", argp[-2], cp); continue; case DGSTSW: if (!(digest = *argp++) || *digest == '-') - adios (NULL, "missing argument to %s", argp[-2]); + mhladios (NULL, "missing argument to %s", argp[-2]); continue; case ISSUESW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - if ((issue = atoi (cp)) < 1) - adios (NULL, "bad argument %s %s", argp[-2], cp); + mhladios (NULL, "missing argument to %s", argp[-2]); + else if ((issue = atoi (cp)) < 1) + mhladios (NULL, "bad argument %s %s", argp[-2], cp); continue; case VOLUMSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - if ((volume = atoi (cp)) < 1) - adios (NULL, "bad argument %s %s", argp[-2], cp); + mhladios (NULL, "missing argument to %s", argp[-2]); + else if ((volume = atoi (cp)) < 1) + mhladios (NULL, "bad argument %s %s", argp[-2], cp); continue; case FORW2SW: - forwall++; /* fall */ + forwall++; + /* FALLTHRU */ case FORW1SW: forwflg++; clearflg = -1;/* XXX */ continue; case BITSTUFFSW: - dashstuff = 1; /* trinary logic */ + dashstuff = 1; /* ternary logic */ continue; case NBITSTUFFSW: - dashstuff = -1; /* trinary logic */ + dashstuff = -1; /* ternary logic */ continue; case NBODYSW: @@ -498,13 +478,13 @@ mhl (int argc, char **argv) folder = getenv ("mhfolder"); if (isatty (fileno (stdout))) { - if (!nomore && !sc_hardcopy() && moreproc && *moreproc != '\0') { + if (!nomore && moreproc && *moreproc != '\0') { if (mhl_action) { SIGNAL (SIGINT, SIG_IGN); SIGNAL2 (SIGQUIT, quitser); } SIGNAL2 (SIGPIPE, pipeser); - m_popen (moreproc); + m_popen (moreproc, mhl_action != NULL); ontty = PITTY; } else { SIGNAL (SIGINT, SIG_IGN); @@ -526,7 +506,7 @@ mhl (int argc, char **argv) if (forwall) { if (digest) { - printf ("%s", delim4); + fputs(delim4, stdout); if (volume == 0) { snprintf (buf, sizeof(buf), "End of %s Digest\n", digest); } else { @@ -538,20 +518,20 @@ mhl (int argc, char **argv) *cp++ = '*'; *cp++ = '\n'; *cp = 0; - printf ("%s", buf); + fputs(buf, stdout); } else printf ("\n------- End of Forwarded Message%s\n", - vecp > 1 ? "s" : ""); + PLURALS(vecp)); } fflush(stdout); if(ferror(stdout)){ - adios("output", "error writing"); + mhladios("output", "error writing"); } if (clearflg > 0 && ontty == NOTTY) - clear_screen (); + nmh_clear_screen (); if (ontty == PITTY) m_pclose (); @@ -564,8 +544,8 @@ static void mhl_format (char *file, int length, int width) { int i; - char *bp, *cp, **ip; - char *ap, buffer[BUFSIZ], name[NAMESZ]; + char *bp, **ip; + char *ap, name[NAMESZ]; struct mcomp *c1; struct stat st; FILE *fp; @@ -579,12 +559,11 @@ mhl_format (char *file, int length, int width) && dev == st.st_dev && ino == st.st_ino) goto out; - else - free_queue (&fmthd, &fmttl); + free_queue (&fmthd, &fmttl); } if ((fp = fopen (etcpath (file), "r")) == NULL) - adios (file, "unable to open format file"); + mhladios (file, "unable to open format file"); if (fstat (fileno (fp), &st) != NOTOK) { mtime = st.st_mtime; @@ -610,11 +589,10 @@ mhl_format (char *file, int length, int width) if (*bp == ';') continue; - if ((cp = strchr(bp, '\n'))) - *cp = 0; + trim_suffix_c(bp, '\n'); if (*bp == ':') { - c1 = add_queue (&fmthd, &fmttl, NULL, bp + 1, CLEARTEXT); + (void) add_queue (&fmthd, &fmttl, NULL, bp + 1, CLEARTEXT); continue; } @@ -628,12 +606,12 @@ 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. */ - if (!mh_strcasecmp (name, "ignores")) { + if (!strcasecmp (name, "ignores")) { char **tmparray, **p; int n = 0; /* split the fields */ - tmparray = brkstring (getcpy (++parptr), ",", NULL); + tmparray = brkstring (mh_xstrdup(++parptr), ",", NULL); /* count number of fields split */ p = tmparray; @@ -648,7 +626,7 @@ mhl_format (char *file, int length, int width) parptr = bp; while (*parptr) { if (evalvar (&global)) - adios (NULL, "format file syntax error: %s", bp); + mhladios (NULL, "format file syntax error: %s", bp); if (*parptr) parptr++; } @@ -659,19 +637,19 @@ mhl_format (char *file, int length, int width) while (*parptr == ':' || *parptr == ',') { parptr++; if (evalvar (c1)) - adios (NULL, "format file syntax error: %s", bp); + mhladios (NULL, "format file syntax error: %s", bp); } if (!c1->c_nfs && global.c_nfs) { if (c1->c_flags & DATEFMT) { if (global.c_flags & DATEFMT) { - c1->c_nfs = getcpy (global.c_nfs); + c1->c_nfs = mh_xstrdup(global.c_nfs); compile_formatfield(c1); } } else if (c1->c_flags & ADDRFMT) { if (global.c_flags & ADDRFMT) { - c1->c_nfs = getcpy (global.c_nfs); + c1->c_nfs = mh_xstrdup(global.c_nfs); compile_formatfield(c1); } } @@ -679,13 +657,15 @@ mhl_format (char *file, int length, int width) continue; default: - adios (NULL, "format file syntax error: %s", bp); + mhladios (NULL, "format file syntax error: %s", bp); } } fclose (fp); if (mhldebug) { for (c1 = fmthd; c1; c1 = c1->c_next) { + char buffer[BUFSIZ]; + fprintf (stderr, "c1: name=\"%s\" text=\"%s\" ovtxt=\"%s\"\n", c1->c_name, c1->c_text, c1->c_ovtxt); fprintf (stderr, "\tnfs=0x%x fmt=0x%x\n", @@ -737,17 +717,17 @@ evalvar (struct mcomp *c1) 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 (!mh_strcasecmp (name, "overflowtext")) + if (!strcasecmp (name, "overflowtext")) 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)); @@ -756,46 +736,46 @@ evalvar (struct mcomp *c1) 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; } - if (!mh_strcasecmp (name, "offset")) + if (!strcasecmp (name, "offset")) return ptoi (name, &c1->c_offset); - if (!mh_strcasecmp (name, "overflowoffset")) + if (!strcasecmp (name, "overflowoffset")) return ptoi (name, &c1->c_ovoff); - if (!mh_strcasecmp (name, "width")) + if (!strcasecmp (name, "width")) return ptoi (name, &c1->c_width); - if (!mh_strcasecmp (name, "compwidth")) + if (!strcasecmp (name, "compwidth")) return ptoi (name, &c1->c_cwidth); - if (!mh_strcasecmp (name, "length")) + if (!strcasecmp (name, "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++) - 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; } - if (!mh_strcasecmp (name, "formatarg")) { + if (!strcasecmp (name, "formatarg")) { struct arglist *args; if (ptos (name, &cp)) return 1; - if (mh_strcasecmp (c1->c_name, "body")) { - advise (NULL, "format filters are currently only supported on " + if (! c1->c_name || strcasecmp (c1->c_name, "body")) { + inform("format filters are currently only supported on " "the \"body\" component"); return 1; } - args = (struct arglist *) calloc((size_t) 1, sizeof(struct arglist)); + NEW0(args); if (arglist_tail) arglist_tail->a_next = args; @@ -821,7 +801,7 @@ ptoi (char *name, int *i) char *cp; if (*parptr++ != '=' || !*(cp = parse ())) { - advise (NULL, "missing argument to variable %s", name); + inform("missing argument to variable %s", name); return 1; } @@ -836,7 +816,7 @@ ptos (char *name, char **s) char c, *cp; if (*parptr++ != '=') { - advise (NULL, "missing argument to variable %s", name); + inform("missing argument to variable %s", name); return 1; } @@ -853,7 +833,7 @@ ptos (char *name, char **s) } c = *parptr; *parptr = 0; - *s = getcpy (cp); + *s = mh_xstrdup(cp); if ((*parptr = c) == '"') parptr++; return 0; @@ -869,15 +849,14 @@ parse (void) for (cp = result; *parptr && (cp - result < NAMESZ); parptr++) { c = *parptr; - if (isalnum (c) - || c == '.' - || c == '-' - || c == '_' - || c =='[' - || c == ']') - *cp++ = c; - else + if (!isalnum (c) + && c != '.' + && c != '-' + && c != '_' + && c !='[' + && c != ']') break; + *cp++ = c; } *cp = '\0'; @@ -892,11 +871,17 @@ parse (void) static void process (char *folder, char *fname, int ofilen, int ofilec) { - char *cp = NULL; - FILE *fp = NULL; + /* static to prevent "might be clobbered" warning from gcc 4.9.2: */ + static char *cp; + static FILE *fp; struct mcomp *c1; struct stat st; struct arglist *ap; + /* volatile to prevent "might be clobbered" warning from gcc: */ + char *volatile fname2 = fname ? fname : "(stdin)"; + + cp = NULL; + fp = NULL; switch (setjmp (env)) { case OK: @@ -908,7 +893,6 @@ process (char *folder, char *fname, int ofilen, int ofilec) return; } } else { - fname = "(stdin)"; fp = stdin; } if (fstat(fileno(fp), &st) == 0) { @@ -916,10 +900,11 @@ process (char *folder, char *fname, int ofilen, int ofilec) } else { filesize = 0; } - cp = folder ? concat (folder, ":", fname, NULL) : getcpy (fname); + cp = folder ? concat (folder, ":", fname2, NULL) : mh_xstrdup(fname2); if (ontty != PITTY) SIGNAL (SIGINT, intrser); - mhlfile (fp, cp, ofilen, ofilec); /* FALL THROUGH! */ + mhlfile (fp, cp, ofilen, ofilec); + free (cp); for (ap = arglist_head; ap; ap = ap->a_next) { fmt_free(ap->a_fmt, 0); @@ -927,18 +912,16 @@ process (char *folder, char *fname, int ofilen, int ofilec) } if (arglist_head) - fmt_free(NULL, 1); + fmt_free(NULL, 1); + /* FALLTHRU */ - default: + default: if (ontty != PITTY) SIGNAL (SIGINT, SIG_IGN); - if (mhl_action == NULL && fp != stdin) + if (mhl_action == NULL && fp != stdin && fp != NULL) fclose (fp); - free (cp); - if (holder.c_text) { - free (holder.c_text); - holder.c_text = NULL; - } + mh_xfree(holder.c_text); + holder.c_text = NULL; free_queue (&msghd, &msgtl); for (c1 = fmthd; c1; c1 = c1->c_next) c1->c_flags &= ~HDROUTPUT; @@ -953,18 +936,18 @@ 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; + char **ip, name[NAMESZ], buf[NMH_BUFSIZ]; + m_getfld_state_t gstate = 0; compile_filterargs(); if (forwall) { if (digest) - printf ("%s", ofilen == 1 ? delim3 : delim4); + fputs(ofilen == 1 ? delim3 : delim4, stdout); else { printf ("\n-------"); if (ofilen == 1) - printf (" Forwarded Message%s", ofilec > 1 ? "s" : ""); + printf (" Forwarded Message%s", PLURALS(ofilec)); else printf (" Message %d", ofilen); printf ("\n\n"); @@ -975,7 +958,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) if (ofilec > 1) { if (ofilen > 1) { if ((global.c_flags & CLEARSCR)) - clear_screen (); + nmh_clear_screen (); else printf ("\n\n\n"); } @@ -993,14 +976,16 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) } fflush (stdout); buf[0] = 0; - read (fileno (stdout), buf, sizeof(buf)); + if (read (fileno (stdout), buf, sizeof(buf)) < 0) { + advise ("stdout", "read"); + } } if (strchr(buf, '\n')) { if ((global.c_flags & CLEARSCR)) - clear_screen (); + nmh_clear_screen (); } else - printf ("\n"); + putchar('\n'); break; default: @@ -1008,7 +993,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) if (ofilen > 1) { printf ("\n\n\n"); if (clearflg > 0) - clear_screen (); + nmh_clear_screen (); } printf (">>> %s\n\n", mname); } @@ -1016,18 +1001,17 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) } } - m_getfld_state_init (&gstate); for (;;) { int bufsz = sizeof buf; - switch (state = m_getfld (gstate, name, buf, &bufsz, fp)) { + 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)) { + if (!strcasecmp (name, *ip)) { while (state == FLDPLUS) { bufsz = sizeof buf; - state = m_getfld (gstate, name, buf, &bufsz, fp); + state = m_getfld (&gstate, name, buf, &bufsz, fp); fmt_appendcomp(bucket, name, buf); } break; @@ -1036,12 +1020,13 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) continue; for (c2 = fmthd; c2; c2 = c2->c_next) - if (!mh_strcasecmp (c2->c_name, name)) + if (!strcasecmp (FENDNULL(c2->c_name), name)) 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 (FENDNULL(c1->c_name), + FENDNULL(c3->c_name))) { c1->c_text = mcomp_add (c1->c_flags, buf, c1->c_text); break; @@ -1050,7 +1035,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) c1 = add_queue (&msghd, &msgtl, name, buf, 0); while (state == FLDPLUS) { bufsz = sizeof buf; - state = m_getfld (gstate, name, buf, &bufsz, fp); + state = m_getfld (&gstate, name, buf, &bufsz, fp); c1->c_text = add (buf, c1->c_text); fmt_appendcomp(bucket, name, buf); } @@ -1066,7 +1051,8 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) 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); @@ -1074,13 +1060,14 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) 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; } - 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) { filterbody(c1, buf, sizeof(buf), state, fp, gstate); @@ -1090,7 +1077,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) while (state == BODY) { putcomp (c1, &holder, BODYCOMP); bufsz = sizeof buf; - state = m_getfld (gstate, name, holder.c_text, + state = m_getfld (&gstate, name, holder.c_text, &bufsz, fp); } free (holder.c_text); @@ -1099,25 +1086,27 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) continue; } for (c2 = msghd; c2; c2 = c2->c_next) - if (!mh_strcasecmp (c2->c_name, c1->c_name)) { + if (!strcasecmp (FENDNULL(c2->c_name), + FENDNULL(c1->c_name))) { 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); + inform("format error in message %s", mname); exitstat++; + m_getfld_state_destroy (&gstate); return; default: - adios (NULL, "getfld() returned %d", state); + mhladios (NULL, "getfld() returned %d", state); } } - m_getfld_state_destroy (&gstate); } @@ -1127,7 +1116,7 @@ mcomp_flags (char *name) 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; @@ -1135,7 +1124,7 @@ mcomp_flags (char *name) static char * -mcomp_add (long flags, char *s1, char *s2) +mcomp_add (unsigned long flags, char *s1, char *s2) { char *dp; @@ -1161,7 +1150,7 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2) { int dat[5]; char *ap, *cp; - char buffer[BUFSIZ], error[BUFSIZ]; + char error[BUFSIZ]; struct pqpair *p, *q; struct pqpair pq; struct mailname *mp; @@ -1171,19 +1160,22 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2) dat[0] = 0; dat[1] = 0; dat[2] = filesize; - dat[3] = sizeof(buffer) - 1; + dat[3] = BUFSIZ - 1; dat[4] = 0; if (!(c1->c_flags & ADDRFMT)) { + charstring_t scanl = charstring_create (BUFSIZ); + if (c1->c_c_text) c1->c_c_text->c_text = ap; if ((cp = strrchr(ap, '\n'))) /* drop ending newline */ if (!cp[1]) *cp = 0; - fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1, dat); + fmt_scan (c1->c_fmt, scanl, BUFSIZ - 1, dat, NULL); /* Don't need to append a newline, dctime() already did */ - c2->c_text = getcpy (buffer); + c2->c_text = charstring_buffer_copy (scanl); + charstring_free (scanl); /* ap is now owned by the component struct, so do NOT free it here */ return; @@ -1191,20 +1183,21 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2) (q = &pq)->pq_next = NULL; while ((cp = getname (ap))) { - if ((p = (struct pqpair *) calloc ((size_t) 1, sizeof(*p))) == NULL) - adios (NULL, "unable to allocate pqpair memory"); - - if ((mp = getm (cp, NULL, 0, AD_NAME, error)) == NULL) { - p->pq_text = getcpy (cp); - p->pq_error = getcpy (error); - } else { - p->pq_text = getcpy (mp->m_text); - mnfree (mp); - } - q = (q->pq_next = p); + NEW0(p); + if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) { + p->pq_text = mh_xstrdup(cp); + p->pq_error = mh_xstrdup(error); + } else { + p->pq_text = getcpy (mp->m_text); + mnfree (mp); + } + q = (q->pq_next = p); } for (p = pq.pq_next; p; p = q) { + charstring_t scanl = charstring_create (BUFSIZ); + char *buffer; + if (c1->c_c_text) { c1->c_c_text->c_text = p->pq_text; p->pq_text = NULL; @@ -1214,7 +1207,8 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2) p->pq_error = NULL; } - fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1, dat); + fmt_scan (c1->c_fmt, scanl, BUFSIZ - 1, dat, NULL); + buffer = charstring_buffer_copy (scanl); if (*buffer) { if (c2->c_text) c2->c_text = add (",\n", c2->c_text); @@ -1222,13 +1216,12 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2) *cp = 0; c2->c_text = add (buffer, c2->c_text); } + charstring_free (scanl); - if (p->pq_text) - free (p->pq_text); - if (p->pq_error) - free (p->pq_error); + mh_xfree(p->pq_text); + mh_xfree(p->pq_error); q = p->pq_next; - free ((char *) p); + free(p); } c2->c_text = add ("\n", c2->c_text); @@ -1241,21 +1234,19 @@ add_queue (struct mcomp **head, struct mcomp **tail, char *name, char *text, int { struct mcomp *c1; - if ((c1 = (struct mcomp *) calloc ((size_t) 1, sizeof(*c1))) == NULL) - adios (NULL, "unable to allocate comp memory"); - + NEW0(c1); c1->c_flags = flags & ~INIT; - if ((c1->c_name = name ? getcpy (name) : NULL)) - c1->c_flags |= mcomp_flags (c1->c_name); - c1->c_text = text ? getcpy (text) : NULL; + if ((c1->c_name = name ? mh_xstrdup(name) : NULL)) + c1->c_flags |= mcomp_flags (c1->c_name); + c1->c_text = text ? mh_xstrdup(text) : NULL; if (flags & INIT) { - if (global.c_ovtxt) - c1->c_ovtxt = getcpy (global.c_ovtxt); - c1->c_offset = global.c_offset; - c1->c_ovoff = global. c_ovoff; - c1->c_width = c1->c_length = 0; - c1->c_cwidth = global.c_cwidth; - c1->c_flags |= global.c_flags & GFLAGS; + if (global.c_ovtxt) + c1->c_ovtxt = mh_xstrdup(global.c_ovtxt); + c1->c_offset = global.c_offset; + c1->c_ovoff = global. c_ovoff; + c1->c_width = c1->c_length = 0; + c1->c_cwidth = global.c_cwidth; + c1->c_flags |= global.c_flags & GFLAGS; } if (*head == NULL) *head = c1; @@ -1274,17 +1265,13 @@ free_queue (struct mcomp **head, struct mcomp **tail) for (c1 = *head; c1; c1 = c2) { c2 = c1->c_next; - if (c1->c_name) - free (c1->c_name); - if (c1->c_text) - free (c1->c_text); - if (c1->c_ovtxt) - free (c1->c_ovtxt); - if (c1->c_nfs) - free (c1->c_nfs); + mh_xfree(c1->c_name); + mh_xfree(c1->c_text); + mh_xfree(c1->c_ovtxt); + mh_xfree(c1->c_nfs); if (c1->c_fmt) fmt_free (c1->c_fmt, 0); - free ((char *) c1); + free(c1); } *head = *tail = NULL; @@ -1294,8 +1281,22 @@ free_queue (struct mcomp **head, struct mcomp **tail) static void putcomp (struct mcomp *c1, struct mcomp *c2, int flag) { + char *text; /* c1's text, or the name as a fallback. */ + char *trimmed_prefix; int count, cchdr; - unsigned char *cp; + char *cp; + const int utf8 = strcasecmp(get_charset(), "UTF-8") == 0; + + if (! utf8 && flag != BODYCOMP) { + /* Don't print 8-bit bytes in header field values if not in a + UTF-8 locale, as required by RFC 6532. */ + c1->c_flags |= FORCE7BIT; + } + + text = c1->c_text ? c1->c_text : c1->c_name; + /* Create a copy with trailing whitespace trimmed, for use with + * blank lines. */ + trimmed_prefix = rtrim(add(text, NULL)); cchdr = 0; lm = 0; @@ -1306,12 +1307,13 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) if ((ovtxt = c1->c_ovtxt ? c1->c_ovtxt : global.c_ovtxt) == NULL) ovtxt = ""; if (wid < ovoff + strlen (ovtxt) + 5) - adios (NULL, "component: %s width(%d) too small for overflow(%d)", + mhladios (NULL, "component: %s width(%d) too small for overflow(%d)", c1->c_name, wid, ovoff + strlen (ovtxt) + 5); onelp = NULL; if (c1->c_flags & CLEARTEXT) { - putstr (c1->c_text, c1->c_flags); + putstr (c1->c_flags & RTRIM ? rtrim (c1->c_text) : c1->c_text, + c1->c_flags); putstr ("\n", c1->c_flags); return; } @@ -1323,7 +1325,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) count = (c1->c_width ? c1->c_width : global.c_width) - c1->c_offset - strlen (c2->c_text); if (!(c1->c_flags & HDROUTPUT) && !(c1->c_flags & NOCOMPONENT)) - count -= strlen (c1->c_text ? c1->c_text : c1->c_name) + 2; + count -= strlen(text) + 2; lm = c1->c_offset + (count / 2); } else { if (c1->c_offset) @@ -1332,18 +1334,15 @@ 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); - putstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags); + to_upper(text); + putstr(text, c1->c_flags); if (flag != BODYCOMP) { putstr (": ", c1->c_flags); if (!(c1->c_flags & SPLIT)) c1->c_flags |= HDROUTPUT; cchdr++; - if ((count = c1->c_cwidth - - strlen (c1->c_text ? c1->c_text : c1->c_name) - 2) > 0) + if ((count = c1->c_cwidth - strlen(text) - 2) > 0) while (count--) putstr (" ", c1->c_flags); } @@ -1355,9 +1354,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) && !(c2->c_flags & HDROUTPUT) && !(c2->c_flags & NOCOMPONENT)) { if (c1->c_flags & UPPERCASE) - for (cp = c2->c_name; *cp; cp++) - if (islower (*cp)) - *cp = toupper (*cp); + to_upper(c2->c_name); putstr (c2->c_name, c1->c_flags); putstr (": ", c1->c_flags); if (!(c1->c_flags & SPLIT)) @@ -1369,9 +1366,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) putstr (" ", c1->c_flags); } if (c1->c_flags & UPPERCASE) - for (cp = c2->c_text; *cp; cp++) - if (islower (*cp)) - *cp = toupper (*cp); + to_upper(c2->c_text); count = 0; if (cchdr) { @@ -1380,31 +1375,43 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) : (int) strlen (c2->c_name) + 2; else count = (c1->c_cwidth >= 0) ? (size_t) c1->c_cwidth - : strlen (c1->c_text ? c1->c_text : c1->c_name) + 2; + : strlen(text) + 2; } count += c1->c_offset; if ((cp = oneline (c2->c_text, c1->c_flags))) - putstr(cp, c1->c_flags); + /* Output line, trimming trailing whitespace if requested. */ + putstr (c1->c_flags & RTRIM ? rtrim (cp) : cp, c1->c_flags); if (term == '\n') putstr ("\n", c1->c_flags); while ((cp = oneline (c2->c_text, c1->c_flags))) { lm = count; if (flag == BODYCOMP - && !(c1->c_flags & NOCOMPONENT)) - putstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags); - if (*cp) - putstr (cp, c1->c_flags); + && !(c1->c_flags & NOCOMPONENT)) { + /* Output component, trimming trailing whitespace if there + is no text on the line. */ + if (*cp) { + putstr(text, c1->c_flags); + } else { + putstr (trimmed_prefix, c1->c_flags); + } + } + if (*cp) { + /* Output line, trimming trailing whitespace if requested. */ + putstr (c1->c_flags & RTRIM ? rtrim (cp) : cp, c1->c_flags); + } if (term == '\n') putstr ("\n", c1->c_flags); } if (flag == BODYCOMP && term == '\n') c1->c_flags &= ~HDROUTPUT; /* Buffer ended on a newline */ + + free (trimmed_prefix); } static char * -oneline (char *stuff, long flags) +oneline (char *stuff, unsigned long flags) { int spc; char *cp, *ret; @@ -1418,17 +1425,16 @@ 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; break; } - else - if (!spc) { - *cp++ = ' '; - spc++; - } + if (!spc) { + *cp++ = ' '; + spc++; + } } else { *cp++ = *onelp; @@ -1456,8 +1462,12 @@ oneline (char *stuff, long flags) static void -putstr (char *string, long flags) +putstr (char *string, unsigned long flags) { + /* To not count, for the purpose of counting columns, all of + the bytes of a multibyte character. */ + int char_len; + if (!column && lm > 0) { while (lm > 0) if (lm >= 8) { @@ -1470,13 +1480,38 @@ putstr (char *string, long flags) } } lm = 0; - while (*string) - putch (*string++, flags); + +#ifdef MULTIBYTE_SUPPORT + if (mbtowc (NULL, NULL, 0)) {} /* reset shift state */ + char_len = 0; +#else + NMH_UNUSED (char_len); +#endif + + while (*string) { + flags &= ~INVISIBLE; +#ifdef MULTIBYTE_SUPPORT + /* mbtowc should never return 0, because *string is non-NULL. */ + if (char_len <= 0) { + /* Find number of bytes in next character. */ + if ((char_len = + mbtowc (NULL, string, (size_t) MB_CUR_MAX)) == -1) { + char_len = 1; + } + } else { + /* Multibyte character, after the first byte. */ + flags |= INVISIBLE; + } + + --char_len; +#endif + putch (*string++, flags); + } } static void -putch (char ch, long flags) +putch (char ch, unsigned long flags) { char buf[BUFSIZ]; @@ -1495,10 +1530,12 @@ putch (char ch, long flags) putchar ('\007'); fflush (stdout); buf[0] = 0; - read (fileno (stdout), buf, sizeof(buf)); + if (read (fileno (stdout), buf, sizeof(buf)) < 0) { + advise ("stdout", "read"); + } if (strchr(buf, '\n')) { if (global.c_flags & CLEARSCR) - clear_screen (); + nmh_clear_screen (); row = 0; } else { putchar ('\n'); @@ -1528,8 +1565,25 @@ putch (char ch, long flags) putchar ('-'); putchar (' '); } - if (ch >= ' ') - column++; + /* + * Increment the character count, unless + * 1) In UTF-8 locale, this is other than the last byte of + a multibyte character, or + * 2) In C locale, will print a non-printable character. + */ + if ((flags & FORCE7BIT) == 0) { + /* UTF-8 locale */ + if ((flags & INVISIBLE) == 0) { + /* If multibyte character, its first byte only. */ + ++column; + } + } else { + /* If not an ASCII character, the replace character will be + displayed. Count it. */ + if (! isascii((unsigned char) ch) || isprint((unsigned char) ch)) { + ++column; + } + } break; } @@ -1537,12 +1591,16 @@ putch (char ch, long flags) putch ('\n', flags); if (ovoff > 0) lm = ovoff; - putstr (ovtxt ? ovtxt : "", flags); + putstr (FENDNULL(ovtxt), flags); putch (ch, flags); return; } - putchar (ch); + if (flags & FORCE7BIT && ! isascii((unsigned char) ch)) { + putchar ('?'); + } else { + putchar (ch); + } } @@ -1562,7 +1620,7 @@ pipeser (int i) { NMH_UNUSED (i); - done (NOTOK); + mhldone (NOTOK); } @@ -1573,68 +1631,9 @@ quitser (int i) putchar ('\n'); fflush (stdout); - done (NOTOK); -} - - -int -mhlsbr (int argc, char **argv, FILE *(*action)()) -{ - SIGNAL_HANDLER istat = NULL, pstat = NULL, qstat = NULL; - char *cp = NULL; - struct mcomp *c1; - struct arglist *a, *a2; - - switch (setjmp (mhlenv)) { - case OK: - cp = invo_name; - sleepsw = 0; /* XXX */ - bellflg = clearflg = forwflg = forwall = exitstat = 0; - digest = NULL; - ontty = NOTTY; - mhl_action = action; - - /* - * If signal is at default action, then start ignoring - * it, else let it set to its current action. - */ - if ((istat = SIGNAL (SIGINT, SIG_IGN)) != SIG_DFL) - SIGNAL (SIGINT, istat); - if ((qstat = SIGNAL (SIGQUIT, SIG_IGN)) != SIG_DFL) - SIGNAL (SIGQUIT, qstat); - pstat = SIGNAL (SIGPIPE, pipeser); - mhl (argc, argv); /* FALL THROUGH! */ - - default: - SIGNAL (SIGINT, istat); - SIGNAL (SIGQUIT, qstat); - SIGNAL (SIGPIPE, SIG_IGN);/* should probably change to block instead */ - if (ontty == PITTY) - m_pclose (); - SIGNAL (SIGPIPE, pstat); - invo_name = cp; - if (holder.c_text) { - free (holder.c_text); - holder.c_text = NULL; - } - free_queue (&msghd, &msgtl); - for (c1 = fmthd; c1; c1 = c1->c_next) - c1->c_flags &= ~HDROUTPUT; - - a = arglist_head; - while (a) { - if (a->a_nfs) - free(a->a_nfs); - a2 = a->a_next; - free(a); - a = a2; - } - return exitstat; - } + mhldone (NOTOK); } -#undef adios -#undef done static void mhladios (char *what, char *fmt, ...) @@ -1659,71 +1658,6 @@ mhldone (int status) } -static int m_pid = NOTOK; -static int sd = NOTOK; - -static void -m_popen (char *name) -{ - int pd[2]; - - if (mhl_action && (sd = dup (fileno (stdout))) == NOTOK) - adios ("standard output", "unable to dup()"); - - if (pipe (pd) == NOTOK) - adios ("pipe", "unable to"); - - switch (m_pid = vfork()) { - case NOTOK: - adios ("fork", "unable to"); - - case OK: - SIGNAL (SIGINT, SIG_DFL); - SIGNAL (SIGQUIT, SIG_DFL); - - close (pd[1]); - if (pd[0] != fileno (stdin)) { - dup2 (pd[0], fileno (stdin)); - close (pd[0]); - } - execlp (name, r1bindex (name, '/'), NULL); - fprintf (stderr, "unable to exec "); - perror (name); - _exit (-1); - - default: - close (pd[0]); - if (pd[1] != fileno (stdout)) { - dup2 (pd[1], fileno (stdout)); - close (pd[1]); - } - } -} - - -void -m_pclose (void) -{ - if (m_pid == NOTOK) - return; - - if (sd != NOTOK) { - fflush (stdout); - if (dup2 (sd, fileno (stdout)) == NOTOK) - adios ("standard output", "unable to dup2()"); - - clearerr (stdout); - close (sd); - sd = NOTOK; - } - else - fclose (stdout); - - pidwait (m_pid, OK); - m_pid = NOTOK; -} - - /* * Compile a format string used by the formatfield option and save it * for later. @@ -1848,8 +1782,10 @@ 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 (gstate, name, buf, &bufsz2, fp); + if (write(fdinput[1], buf, strlen(buf)) < 0) { + advise ("pipe output", "write"); + } + state = m_getfld (&gstate, name, buf, &bufsz2, fp); } /* @@ -1862,7 +1798,6 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp, * buffers that we have duplicated from the parent. */ _exit(0); - break; case -1: adios(NULL, "Unable to fork for filter writer process"); break; @@ -1874,18 +1809,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; @@ -1896,23 +1830,26 @@ 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++) { - args[i] = mh_xmalloc(BUFSIZ); - fmt_scan(a->a_fmt, args[i], BUFSIZ - 1, BUFSIZ, dat); + for (a = arglist_head, i = argp; a != NULL; a = a->a_next, i++) { + charstring_t scanl = charstring_create (BUFSIZ); + + fmt_scan(a->a_fmt, scanl, BUFSIZ, dat, NULL); + args[i] = charstring_buffer_copy (scanl); + charstring_free (scanl); /* * fmt_scan likes to put a trailing newline at the end of the * format string. If we have one, get rid of it. */ s = strlen(args[i]); if (args[i][s - 1] == '\n') - args[i][s - 1] = '\0'; + args[i][s - 1] = '\0'; if (mhldebug) - fprintf(stderr, "filterarg: fmt=\"%s\", output=\"%s\"\n", + fprintf(stderr, "filterarg: fmt=\"%s\", output=\"%s\"\n", a->a_nfs, args[i]); } - if (dup2(fdinput[0], STDIN_FILENO) < 0) { + if (dup2(fdinput[0], STDIN_FILENO) < 0) { adios("formatproc", "Unable to dup2() standard input"); } if (dup2(fdoutput[1], STDOUT_FILENO) < 0) {