X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6e1d79d58e5da5ba06bc42ebebd2f6f8f2ceb52e..9291a5f82480f2458e04cb9ea7e6749bc952b308:/uip/mhlsbr.c diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index c56acff9..0fbdc6cd 100644 --- a/uip/mhlsbr.c +++ b/uip/mhlsbr.c @@ -1,20 +1,36 @@ - -/* - * 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 * complete copyright information. */ -#include -#include -#include -#include -#include -#include +#include "h/mh.h" +#include "sbr/r1bindex.h" +#include "sbr/snprintb.h" +#include "sbr/copyip.h" +#include "sbr/discard.h" +#include "sbr/trimcpy.h" +#include "sbr/vfgets.h" +#include "sbr/check_charset.h" +#include "sbr/getcpy.h" +#include "sbr/brkstring.h" +#include "sbr/ambigsw.h" +#include "sbr/pidstatus.h" +#include "sbr/print_version.h" +#include "sbr/print_help.h" +#include "sbr/arglist.h" +#include "sbr/error.h" +#include "h/signals.h" +#include "h/addrsbr.h" +#include "h/fmt_scan.h" +#include "h/tws.h" +#include "h/done.h" +#include "h/utils.h" +#include "sbr/m_popen.h" #include #include +#include "sbr/terminal.h" /* * MAJOR BUG: @@ -22,7 +38,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]) @@ -259,9 +275,9 @@ static char *addrcomps[] = { static int bellflg = 0; static int clearflg = 0; static int dashstuff = 0; -static int dobody = 1; -static int forwflg = 0; -static int forwall = 0; +static bool dobody = true; +static bool forwflg; +static bool forwall; static int sleepsw = NOTOK; @@ -270,7 +286,7 @@ static int volume = 0; static int issue = 0; static int exitstat = 0; -static int mhldebug = 0; +static bool mhldebug; static int filesize = 0; @@ -298,21 +314,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; - -/* - * Redefine a couple of functions. - * These are undefined later in the code. - */ -#define adios mhladios -#define done mhldone - /* * prototypes */ @@ -323,7 +329,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); @@ -332,12 +338,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); @@ -346,7 +353,8 @@ static void compile_filterargs (void); int mhl (int argc, char **argv) { - int length = 0, nomore = 0; + int length = 0; + bool nomore = false; unsigned int i, vecp = 0; int width = 0; char *cp, *folder = NULL, *form = NULL; @@ -360,24 +368,24 @@ mhl (int argc, char **argv) argp = arguments; if ((cp = getenv ("MHLDEBUG")) && *cp) - mhldebug++; + mhldebug = true; while ((cp = *argp++)) { if (*cp == '-') { switch (smatch (++cp, mhlswitches)) { case AMBIGSW: ambigsw (cp, mhlswitches); - done (1); + mhldone (1); case UNKWNSW: - adios (NULL, "-%s unknown\n", cp); + mhladios (NULL, "-%s unknown\n", cp); case HELPSW: snprintf (buf, sizeof(buf), "%s [switches] [files ...]", invo_name); print_help (buf, mhlswitches, 1); - done (0); + mhldone (0); case VERSIONSW: print_version(invo_name); - done (0); + mhldone (0); case BELLSW: bellflg = 1; @@ -395,31 +403,30 @@ 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]); - else - sleepsw = atoi (cp);/* ZERO ok! */ + mhladios (NULL, "missing argument to %s", argp[-2]); + 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++; + nomore = true; continue; 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; @@ -427,50 +434,51 @@ mhl (int argc, char **argv) case LENSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - else if ((length = atoi (cp)) < 1) - adios (NULL, "bad argument %s %s", argp[-2], cp); + mhladios (NULL, "missing argument to %s", argp[-2]); + 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]); - else if ((width = atoi (cp)) < 1) - adios (NULL, "bad argument %s %s", argp[-2], cp); + mhladios (NULL, "missing argument to %s", argp[-2]); + 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]); - else if ((issue = atoi (cp)) < 1) - adios (NULL, "bad argument %s %s", argp[-2], cp); + mhladios (NULL, "missing argument to %s", argp[-2]); + 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]); - else if ((volume = atoi (cp)) < 1) - adios (NULL, "bad argument %s %s", argp[-2], cp); + mhladios (NULL, "missing argument to %s", argp[-2]); + if ((volume = atoi (cp)) < 1) + mhladios (NULL, "bad argument %s %s", argp[-2], cp); continue; case FORW2SW: - forwall++; /* fall */ + forwall = true; + /* FALLTHRU */ case FORW1SW: - forwflg++; + forwflg = true; 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: - dobody = 0; + dobody = false; continue; } } @@ -482,12 +490,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); @@ -525,12 +529,12 @@ mhl (int argc, char **argv) } 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) @@ -566,7 +570,7 @@ mhl_format (char *file, int length, int width) } 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; @@ -592,7 +596,7 @@ mhl_format (char *file, int length, int width) if (*bp == ';') continue; - TrimSuffixC(bp, '\n'); + trim_suffix_c(bp, '\n'); if (*bp == ':') { (void) add_queue (&fmthd, &fmttl, NULL, bp + 1, CLEARTEXT); @@ -629,7 +633,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++; } @@ -640,7 +644,7 @@ 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) { @@ -648,19 +652,17 @@ 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; default: - adios (NULL, "format file syntax error: %s", bp); + mhladios (NULL, "format file syntax error: %s", bp); } } fclose (fp); @@ -671,9 +673,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); @@ -757,7 +758,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)) { @@ -773,7 +774,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; } @@ -804,7 +805,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; } @@ -819,7 +820,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; } @@ -852,15 +853,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'; @@ -890,7 +890,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++; @@ -907,7 +907,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) { @@ -916,14 +916,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) @@ -939,8 +940,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(); @@ -948,12 +949,12 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) if (digest) fputs(ofilen == 1 ? delim3 : delim4, stdout); else { - printf ("\n-------"); + fputs("\n-------", stdout); 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) { @@ -963,27 +964,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 (); } @@ -994,7 +990,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 (); } @@ -1004,9 +1000,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); @@ -1014,7 +1011,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; @@ -1023,13 +1020,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; @@ -1038,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_getfld2(&gstate, name, buf, &bufsz); c1->c_text = add (buf, c1->c_text); fmt_appendcomp(bucket, name, buf); } @@ -1073,15 +1070,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; @@ -1089,8 +1086,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; @@ -1101,13 +1098,13 @@ 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; default: - adios (NULL, "getfld() returned %d", state); + mhladios (NULL, "getfld() returned %d", state); } } } @@ -1120,7 +1117,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; } @@ -1221,8 +1218,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); } @@ -1268,10 +1265,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); @@ -1286,7 +1283,8 @@ 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; + int count; + bool cchdr; char *cp; const int utf8 = strcasecmp(get_charset(), "UTF-8") == 0; @@ -1299,9 +1297,9 @@ 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; + cchdr = false; lm = 0; llim = c1->c_length ? c1->c_length : -1; wid = c1->c_width ? c1->c_width : global.c_width; @@ -1310,7 +1308,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) - adios (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; @@ -1337,14 +1335,14 @@ 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 */ - ToUpper(text); + 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++; + cchdr = true; if ((count = c1->c_cwidth - strlen(text) - 2) > 0) while (count--) putstr (" ", c1->c_flags); @@ -1357,19 +1355,19 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) && !(c2->c_flags & HDROUTPUT) && !(c2->c_flags & NOCOMPONENT)) { if (c1->c_flags & UPPERCASE) - ToUpper(c2->c_name); + to_upper(c2->c_name); putstr (c2->c_name, c1->c_flags); putstr (": ", c1->c_flags); if (!(c1->c_flags & SPLIT)) c2->c_flags |= HDROUTPUT; - cchdr++; + cchdr = true; if ((count = c1->c_cwidth - strlen (c2->c_name) - 2) > 0) while (count--) putstr (" ", c1->c_flags); } if (c1->c_flags & UPPERCASE) - ToUpper(c2->c_text); + to_upper(c2->c_text); count = 0; if (cchdr) { @@ -1416,33 +1414,32 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) static char * oneline (char *stuff, unsigned long flags) { - int spc; + bool spc; char *cp, *ret; if (onelp == NULL) onelp = stuff; if (*onelp == 0) - return (onelp = NULL); + return onelp = NULL; ret = onelp; term = 0; if (flags & COMPRESS) { - for (spc = 1, cp = ret; *onelp; onelp++) + for (spc = true, cp = ret; *onelp; 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 = true; + } } else { *cp++ = *onelp; - spc = 0; + spc = false; } *cp = 0; @@ -1517,8 +1514,6 @@ putstr (char *string, unsigned long flags) static void putch (char ch, unsigned long flags) { - char buf[BUFSIZ]; - if (llim == 0) return; @@ -1533,11 +1528,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; @@ -1595,7 +1586,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; } @@ -1607,6 +1598,34 @@ 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) @@ -1624,7 +1643,7 @@ pipeser (int i) { NMH_UNUSED (i); - done (NOTOK); + mhldone (NOTOK); } @@ -1635,13 +1654,10 @@ quitser (int i) putchar ('\n'); fflush (stdout); - done (NOTOK); + mhldone (NOTOK); } -#undef adios -#undef done - static void mhladios (char *what, char *fmt, ...) { @@ -1658,10 +1674,7 @@ static void mhldone (int status) { exitstat = status; - if (mhl_action) - longjmp (mhlenv, DONE); - else - done (exitstat); + done (exitstat); } @@ -1733,8 +1746,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]; @@ -1747,11 +1760,11 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp, */ if (pipe(fdinput) < 0) { - adios(NULL, "Unable to create input pipe"); + die("Unable to create input pipe"); } if (pipe(fdoutput) < 0) { - adios(NULL, "Unable to create output pipe"); + die("Unable to create output pipe"); } /* @@ -1784,7 +1797,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) { @@ -1792,7 +1805,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); } /* @@ -1806,7 +1819,7 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp, */ _exit(0); case -1: - adios(NULL, "Unable to fork for filter writer process"); + die("Unable to fork for filter writer process"); break; } @@ -1881,7 +1894,7 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp, break; case -1: - adios(NULL, "Unable to fork format program"); + die("Unable to fork format program"); } /* @@ -1904,7 +1917,7 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp, } if (cc < 0) { - adios(NULL, "reading from formatproc"); + die("reading from formatproc"); } /*