X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8a14191c0a0ad15bb8f35b49748c75c1e0a8c2f4..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/mhlsbr.c diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index d5d32b17..df0e24bf 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,8 +11,10 @@ #include #include #include +#include "sbr/m_popen.h" #include #include +#include "sbr/terminal.h" /* * MAJOR BUG: @@ -22,7 +22,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]) @@ -304,7 +304,7 @@ static char delim3[] = /* from forw.c */ "\n----------------------------------------------------------------------\n\n"; static char delim4[] = "\n------------------------------\n\n"; -static FILE *(*mhl_action) () = (FILE *(*) ()) 0; +static FILE *(*mhl_action)(char *); /* * prototypes @@ -316,7 +316,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); @@ -328,9 +328,9 @@ 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 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); @@ -361,20 +361,16 @@ mhl (int argc, char **argv) case AMBIGSW: ambigsw (cp, mhlswitches); mhldone (1); - /* FALLTHRU */ case UNKWNSW: mhladios (NULL, "-%s unknown\n", cp); - /* FALLTHRU */ case HELPSW: snprintf (buf, sizeof(buf), "%s [switches] [files ...]", invo_name); print_help (buf, mhlswitches, 1); mhldone (0); - /* FALLTHRU */ case VERSIONSW: print_version(invo_name); mhldone (0); - /* FALLTHRU */ case BELLSW: bellflg = 1; @@ -402,8 +398,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: @@ -425,13 +420,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; @@ -442,13 +437,13 @@ 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; @@ -461,10 +456,10 @@ mhl (int argc, char **argv) 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: @@ -523,7 +518,7 @@ mhl (int argc, char **argv) } else printf ("\n------- End of Forwarded Message%s\n", - vecp > 1 ? "s" : ""); + PLURALS(vecp)); } fflush(stdout); @@ -646,14 +641,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; @@ -669,9 +662,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); @@ -850,15 +842,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'; @@ -922,7 +913,7 @@ process (char *folder, char *fname, int ofilen, int ofilec) SIGNAL (SIGINT, SIG_IGN); if (mhl_action == NULL && 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) @@ -938,8 +929,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(); @@ -949,10 +940,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) { @@ -962,7 +953,7 @@ 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); } @@ -973,7 +964,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) 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); @@ -993,7 +984,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 (); } @@ -1003,9 +994,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); @@ -1013,7 +1005,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; @@ -1022,13 +1014,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; @@ -1037,7 +1029,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); } @@ -1072,15 +1064,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; @@ -1088,8 +1080,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; @@ -1220,8 +1212,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); } @@ -1267,10 +1259,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); @@ -1298,7 +1290,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; @@ -1309,7 +1301,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; @@ -1433,11 +1425,10 @@ oneline (char *stuff, unsigned long flags) *onelp++ = 0; break; } - else - if (!spc) { - *cp++ = ' '; - spc++; - } + if (!spc) { + *cp++ = ' '; + spc++; + } } else { *cp++ = *onelp; @@ -1594,7 +1585,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; } @@ -1656,8 +1647,7 @@ mhldone (int status) exitstat = status; if (mhl_action) longjmp (mhlenv, DONE); - else - done (exitstat); + done (exitstat); } @@ -1729,8 +1719,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]; @@ -1780,7 +1770,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) { @@ -1788,7 +1778,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); } /*