X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5daced28b0c7cfbf2d948c9e7098d3bef7c21d2c..8699f1cc:/uip/mhlsbr.c?ds=inline diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index 329ad79e..5c050e3e 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 @@ -12,9 +10,12 @@ #include #include #include +#include "h/done.h" #include +#include "sbr/m_popen.h" #include #include +#include "sbr/terminal.h" /* * MAJOR BUG: @@ -22,7 +23,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]) @@ -298,14 +299,11 @@ static int num_ignores = 0; static char *ignores[MAXARGS]; static jmp_buf env; -static jmp_buf mhlenv; static char delim3[] = /* from forw.c */ "\n----------------------------------------------------------------------\n\n"; static char delim4[] = "\n------------------------------\n\n"; -static FILE *(*mhl_action) () = (FILE *(*) ()) 0; - /* * prototypes */ @@ -316,7 +314,7 @@ static int ptos (char *, char **); static char *parse (void); static void process (char *, char *, int, int); static void mhlfile (FILE *, char *, int, int); -static int mcomp_flags (char *); +static int mcomp_flags (char *) PURE; 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); @@ -325,12 +323,13 @@ static void putcomp (struct mcomp *, struct mcomp *, int); static char *oneline (char *, unsigned long); static void putstr (char *, unsigned long); static void putch (char, unsigned long); +static bool linefeed_typed(void); static void intrser (int); static void pipeser (int); static void quitser (int); -static void mhladios (char *, char *, ...); -static void mhldone (int); -static void filterbody (struct mcomp *, char *, int, int, FILE *, +static void mhladios (char *, char *, ...) CHECK_PRINTF(2, 3) NORETURN; +static void mhldone (int) NORETURN; +static void filterbody (struct mcomp *, char *, int, int, m_getfld_state_t); static void compile_formatfield(struct mcomp *); static void compile_filterargs (void); @@ -398,8 +397,7 @@ mhl (int argc, char **argv) case SLEEPSW: if (!(cp = *argp++) || *cp == '-') mhladios (NULL, "missing argument to %s", argp[-2]); - else - sleepsw = atoi (cp);/* ZERO ok! */ + sleepsw = atoi (cp);/* ZERO ok! */ continue; case PROGSW: @@ -421,13 +419,13 @@ mhl (int argc, char **argv) case LENSW: if (!(cp = *argp++) || *cp == '-') mhladios (NULL, "missing argument to %s", argp[-2]); - else if ((length = atoi (cp)) < 1) + if ((length = atoi (cp)) < 1) mhladios (NULL, "bad argument %s %s", argp[-2], cp); continue; case WIDTHSW: if (!(cp = *argp++) || *cp == '-') mhladios (NULL, "missing argument to %s", argp[-2]); - else if ((width = atoi (cp)) < 1) + if ((width = atoi (cp)) < 1) mhladios (NULL, "bad argument %s %s", argp[-2], cp); continue; @@ -438,28 +436,29 @@ mhl (int argc, char **argv) case ISSUESW: if (!(cp = *argp++) || *cp == '-') mhladios (NULL, "missing argument to %s", argp[-2]); - else if ((issue = atoi (cp)) < 1) + if ((issue = atoi (cp)) < 1) mhladios (NULL, "bad argument %s %s", argp[-2], cp); continue; case VOLUMSW: if (!(cp = *argp++) || *cp == '-') mhladios (NULL, "missing argument to %s", argp[-2]); - else if ((volume = atoi (cp)) < 1) + 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: @@ -475,12 +474,8 @@ mhl (int argc, char **argv) if (isatty (fileno (stdout))) { if (!nomore && moreproc && *moreproc != '\0') { - if (mhl_action) { - SIGNAL (SIGINT, SIG_IGN); - SIGNAL2 (SIGQUIT, quitser); - } SIGNAL2 (SIGPIPE, pipeser); - m_popen (moreproc, mhl_action != NULL); + m_popen(moreproc, false); ontty = PITTY; } else { SIGNAL (SIGINT, SIG_IGN); @@ -518,7 +513,7 @@ mhl (int argc, char **argv) } else printf ("\n------- End of Forwarded Message%s\n", - vecp > 1 ? "s" : ""); + PLURALS(vecp)); } fflush(stdout); @@ -641,14 +636,12 @@ mhl_format (char *file, int length, int width) 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 = mh_xstrdup(global.c_nfs); - compile_formatfield(c1); - } - } + } else if (c1->c_flags & ADDRFMT) { + if (global.c_flags & ADDRFMT) { + c1->c_nfs = mh_xstrdup(global.c_nfs); + compile_formatfield(c1); + } + } } continue; @@ -664,9 +657,8 @@ mhl_format (char *file, int length, int width) 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", - (unsigned int)(unsigned long) c1->c_nfs, - (unsigned int)(unsigned long) c1->c_fmt); + fprintf(stderr, "\tnfs=%p fmt=%p\n", + (void *)c1->c_nfs, (void *)c1->c_fmt); fprintf (stderr, "\toffset=%d ovoff=%d width=%d cwidth=%d length=%d\n", c1->c_offset, c1->c_ovoff, c1->c_width, c1->c_cwidth, c1->c_length); @@ -750,7 +742,7 @@ evalvar (struct mcomp *c1) if (!strcasecmp (name, "length")) return ptoi (name, &c1->c_length); if (!strcasecmp (name, "nodashstuffing")) - return (dashstuff = -1); + return dashstuff = -1; for (ap = triples; ap->t_name; ap++) if (!strcasecmp (ap->t_name, name)) { @@ -766,7 +758,7 @@ evalvar (struct mcomp *c1) return 1; if (! c1->c_name || strcasecmp (c1->c_name, "body")) { - advise (NULL, "format filters are currently only supported on " + inform("format filters are currently only supported on " "the \"body\" component"); return 1; } @@ -797,7 +789,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; } @@ -812,7 +804,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; } @@ -845,15 +837,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'; @@ -883,7 +874,7 @@ process (char *folder, char *fname, int ofilen, int ofilec) switch (setjmp (env)) { case OK: if (fname) { - fp = mhl_action ? (*mhl_action) (fname) : fopen (fname, "r"); + fp = fopen(fname, "r"); if (fp == NULL) { advise (fname, "unable to open"); exitstat++; @@ -900,7 +891,7 @@ process (char *folder, char *fname, int ofilen, int ofilec) 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) { @@ -909,14 +900,15 @@ process (char *folder, char *fname, int ofilen, int ofilec) } if (arglist_head) - fmt_free(NULL, 1); + fmt_free(NULL, 1); + /* FALLTHRU */ default: if (ontty != PITTY) SIGNAL (SIGINT, SIG_IGN); - if (mhl_action == NULL && fp != stdin && fp != NULL) + if (fp != stdin && fp != NULL) fclose (fp); - mh_xfree(holder.c_text); + free(holder.c_text); holder.c_text = NULL; free_queue (&msghd, &msgtl); for (c1 = fmthd; c1; c1 = c1->c_next) @@ -932,8 +924,8 @@ 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; + char **ip, name[NAMESZ], buf[NMH_BUFSIZ]; + m_getfld_state_t gstate; compile_filterargs(); @@ -943,10 +935,10 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) 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"); + puts("\n"); } } else { switch (ontty) { @@ -956,27 +948,22 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) if ((global.c_flags & CLEARSCR)) nmh_clear_screen (); else - printf ("\n\n\n"); + puts("\n\n"); } printf (">>> %s\n\n", mname); } break; case ISTTY: - strncpy (buf, "\n", sizeof(buf)); if (ofilec > 1) { if (SOprintf ("Press to list \"%s\"...", mname)) { if (ofilen > 1) - printf ("\n\n\n"); + puts("\n\n"); printf ("Press to list \"%s\"...", mname); } fflush (stdout); - buf[0] = 0; - if (read (fileno (stdout), buf, sizeof(buf)) < 0) { - advise ("stdout", "read"); - } } - if (strchr(buf, '\n')) { + if (ofilec == 1 || linefeed_typed()) { if ((global.c_flags & CLEARSCR)) nmh_clear_screen (); } @@ -987,7 +974,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) default: if (ofilec > 1) { if (ofilen > 1) { - printf ("\n\n\n"); + puts("\n\n"); if (clearflg > 0) nmh_clear_screen (); } @@ -997,9 +984,10 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) } } + gstate = m_getfld_state_init(fp); for (;;) { int bufsz = sizeof buf; - switch (state = m_getfld (&gstate, name, buf, &bufsz, fp)) { + switch (state = m_getfld2(&gstate, name, buf, &bufsz)) { case FLD: case FLDPLUS: bucket = fmt_addcomptext(name, buf); @@ -1007,7 +995,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) if (!strcasecmp (name, *ip)) { while (state == FLDPLUS) { bufsz = sizeof buf; - state = m_getfld (&gstate, name, buf, &bufsz, fp); + state = m_getfld2(&gstate, name, buf, &bufsz); fmt_appendcomp(bucket, name, buf); } break; @@ -1016,13 +1004,13 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) continue; for (c2 = fmthd; c2; c2 = c2->c_next) - if (!strcasecmp (c2->c_name ? 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 (!strcasecmp (c1->c_name ? c1->c_name : "", - c3->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; @@ -1031,7 +1019,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_getfld2(&gstate, name, buf, &bufsz); c1->c_text = add (buf, c1->c_text); fmt_appendcomp(bucket, name, buf); } @@ -1066,15 +1054,15 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) !strcasecmp (c1->c_name, "body"))) { if (c1->c_flags & FMTFILTER && state == BODY && formatproc != NULL) { - filterbody(c1, buf, sizeof(buf), state, fp, gstate); + filterbody(c1, buf, sizeof(buf), state, gstate); } else { holder.c_text = mh_xmalloc (sizeof(buf)); strncpy (holder.c_text, buf, sizeof(buf)); while (state == BODY) { putcomp (c1, &holder, BODYCOMP); bufsz = sizeof buf; - state = m_getfld (&gstate, name, holder.c_text, - &bufsz, fp); + state = m_getfld2(&gstate, name, holder.c_text, + &bufsz); } free (holder.c_text); holder.c_text = NULL; @@ -1082,8 +1070,8 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) continue; } for (c2 = msghd; c2; c2 = c2->c_next) - if (!strcasecmp (c2->c_name ? c2->c_name : "", - c1->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; @@ -1094,7 +1082,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) 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; @@ -1113,7 +1101,7 @@ mcomp_flags (char *name) for (ap = pairs; ap->p_name; ap++) if (!strcasecmp (ap->p_name, name)) - return (ap->p_flags); + return ap->p_flags; return 0; } @@ -1214,8 +1202,8 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2) } charstring_free (scanl); - mh_xfree(p->pq_text); - mh_xfree(p->pq_error); + free(p->pq_text); + free(p->pq_error); q = p->pq_next; free(p); } @@ -1261,10 +1249,10 @@ free_queue (struct mcomp **head, struct mcomp **tail) for (c1 = *head; c1; c1 = c2) { c2 = c1->c_next; - mh_xfree(c1->c_name); - mh_xfree(c1->c_text); - mh_xfree(c1->c_ovtxt); - mh_xfree(c1->c_nfs); + free(c1->c_name); + free(c1->c_text); + free(c1->c_ovtxt); + free(c1->c_nfs); if (c1->c_fmt) fmt_free (c1->c_fmt, 0); free(c1); @@ -1292,7 +1280,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) 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)); + trimmed_prefix = rtrim(mh_xstrdup(FENDNULL(text))); cchdr = 0; lm = 0; @@ -1303,7 +1291,7 @@ 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) - mhladios (NULL, "component: %s width(%d) too small for overflow(%d)", + mhladios(NULL, "component: %s width(%d) too small for overflow(%zu)", c1->c_name, wid, ovoff + strlen (ovtxt) + 5); onelp = NULL; @@ -1415,7 +1403,7 @@ oneline (char *stuff, unsigned long flags) if (onelp == NULL) onelp = stuff; if (*onelp == 0) - return (onelp = NULL); + return onelp = NULL; ret = onelp; term = 0; @@ -1427,11 +1415,10 @@ oneline (char *stuff, unsigned long flags) *onelp++ = 0; break; } - else - if (!spc) { - *cp++ = ' '; - spc++; - } + if (!spc) { + *cp++ = ' '; + spc++; + } } else { *cp++ = *onelp; @@ -1510,8 +1497,6 @@ putstr (char *string, unsigned long flags) static void putch (char ch, unsigned long flags) { - char buf[BUFSIZ]; - if (llim == 0) return; @@ -1526,11 +1511,7 @@ putch (char ch, unsigned long flags) if (global.c_flags & BELL) putchar ('\007'); fflush (stdout); - buf[0] = 0; - if (read (fileno (stdout), buf, sizeof(buf)) < 0) { - advise ("stdout", "read"); - } - if (strchr(buf, '\n')) { + if (linefeed_typed()) { if (global.c_flags & CLEARSCR) nmh_clear_screen (); row = 0; @@ -1588,7 +1569,7 @@ putch (char ch, unsigned long flags) putch ('\n', flags); if (ovoff > 0) lm = ovoff; - putstr (ovtxt ? ovtxt : "", flags); + putstr (FENDNULL(ovtxt), flags); putch (ch, flags); return; } @@ -1600,6 +1581,33 @@ putch (char ch, unsigned long flags) } } +/* linefeed_typed() makes a single read(2) from stdin and returns true + * if a linefeed character is amongst the characters read. + * A read error is treated as if linefeed wasn't typed. + * + * Typing on a TTY can cause read() to return data without typing Enter + * by using the TTY's EOF character instead, normally ASCII EOT, Ctrl-D. + * The linefeed can also be escaped with the TTY's LNEXT character, + * normally ASCII SYN, Ctrl-V, by typing Ctrl-V Ctrl-J. + * It's not possible to distinguish between the user typing a buffer's + * worth of characters and then EOT, or more than the buffer can hold. + * Either way, the result depends on ASCII LF, either from typing Enter + * or an escaped Ctrl-J, being amongst the read characters. + */ +static bool linefeed_typed(void) +{ + char buf[128]; + ssize_t n; + + n = read(0, buf, sizeof buf); + if (n == -1) { + advise("stdin", "read"); + return false; /* Treat as EOF. */ + } + + return memchr(buf, '\n', n); +} + static void intrser (int i) @@ -1648,10 +1656,7 @@ static void mhldone (int status) { exitstat = status; - if (mhl_action) - longjmp (mhlenv, DONE); - else - done (exitstat); + done (exitstat); } @@ -1723,8 +1728,8 @@ compile_filterargs (void) */ static void -filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp, - m_getfld_state_t gstate) +filterbody (struct mcomp *c1, char *buf, int bufsz, int state, + m_getfld_state_t gstate) { struct mcomp holder; char name[NAMESZ]; @@ -1774,7 +1779,7 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp, close(fdoutput[1]); /* - * Call m_getfld() until we're no longer in the BODY state + * Call m_getfld2() until we're no longer in the BODY state */ while (state == BODY) { @@ -1782,7 +1787,7 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp, if (write(fdinput[1], buf, strlen(buf)) < 0) { advise ("pipe output", "write"); } - state = m_getfld (&gstate, name, buf, &bufsz2, fp); + state = m_getfld2(&gstate, name, buf, &bufsz2); } /*