X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8bb0f8000b86df9270f2410de3fb6f41fa63e88b..167e542b:/uip/mhlsbr.c?ds=inline diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index 58ffe94c..0788d1ef 100644 --- a/uip/mhlsbr.c +++ b/uip/mhlsbr.c @@ -14,9 +14,6 @@ #include #include #include -#include -#include -#include #include /* @@ -44,55 +41,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 */ @@ -305,7 +285,7 @@ static unsigned int wid; static char *ovtxt; -static unsigned char *onelp; +static char *onelp; static char *parptr; @@ -628,7 +608,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. */ - if (!mh_strcasecmp (name, "ignores")) { + if (!strcasecmp (name, "ignores")) { char **tmparray, **p; int n = 0; @@ -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,40 +736,40 @@ 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")) { + if (! c1->c_name || strcasecmp (c1->c_name, "body")) { advise (NULL, "format filters are currently only supported on " "the \"body\" component"); return 1; @@ -897,6 +877,8 @@ process (char *folder, char *fname, int ofilen, int ofilec) struct mcomp *c1; struct stat st; struct arglist *ap; + /* volatile to prevent "might be clobbered" warning from gcc: */ + char *volatile fname2 = fname ? fname : "(stdin)"; switch (setjmp (env)) { case OK: @@ -908,7 +890,6 @@ process (char *folder, char *fname, int ofilen, int ofilec) return; } } else { - fname = "(stdin)"; fp = stdin; } if (fstat(fileno(fp), &st) == 0) { @@ -916,7 +897,7 @@ 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) : getcpy (fname2); if (ontty != PITTY) SIGNAL (SIGINT, intrser); mhlfile (fp, cp, ofilen, ofilec); /* FALL THROUGH! */ @@ -1023,7 +1004,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) 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); @@ -1035,12 +1016,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 (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) - 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; @@ -1065,7 +1047,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); @@ -1073,13 +1056,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); @@ -1098,25 +1082,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 (c2->c_name ? c2->c_name : "", + c1->c_name ? 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); exitstat++; + m_getfld_state_destroy (&gstate); return; default: adios (NULL, "getfld() returned %d", state); } } - m_getfld_state_destroy (&gstate); } @@ -1126,7 +1112,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; @@ -1180,7 +1166,8 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2) if (!cp[1]) *cp = 0; - fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1, dat); + fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1, + dat, NULL); /* Don't need to append a newline, dctime() already did */ c2->c_text = getcpy (buffer); @@ -1193,7 +1180,7 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2) 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) { + if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) { p->pq_text = getcpy (cp); p->pq_error = getcpy (error); } else { @@ -1213,7 +1200,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, buffer, sizeof buffer - 1, sizeof buffer - 1, + dat, NULL); if (*buffer) { if (c2->c_text) c2->c_text = add (",\n", c2->c_text); @@ -1294,7 +1282,7 @@ static void putcomp (struct mcomp *c1, struct mcomp *c2, int flag) { int count, cchdr; - unsigned char *cp; + char *cp; cchdr = 0; lm = 0; @@ -1332,8 +1320,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); @@ -1355,8 +1343,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)) @@ -1369,8 +1357,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) { @@ -1417,7 +1405,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; @@ -1665,6 +1653,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()"); @@ -1672,7 +1662,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"); @@ -1685,7 +1675,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); @@ -1861,7 +1852,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; @@ -1873,18 +1863,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; @@ -1895,9 +1884,9 @@ 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); + fmt_scan(a->a_fmt, args[i], BUFSIZ - 1, BUFSIZ, dat, NULL); /* * fmt_scan likes to put a trailing newline at the end of the * format string. If we have one, get rid of it.