-/*
- * 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
#include <h/fmt_scan.h>
#include <h/tws.h>
#include <h/utils.h>
+#include "sbr/m_popen.h"
#include <setjmp.h>
#include <sys/types.h>
+#include "sbr/terminal.h"
/*
* MAJOR BUG:
* 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])
"\n----------------------------------------------------------------------\n\n";
static char delim4[] = "\n------------------------------\n\n";
-static FILE *(*mhl_action) () = (FILE *(*) ()) 0;
+static FILE *(*mhl_action)(char *);
/*
* prototypes
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);
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);
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;
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:
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;
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;
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:
}
else
printf ("\n------- End of Forwarded Message%s\n",
- vecp > 1 ? "s" : "");
+ PLURALS(vecp));
}
fflush(stdout);
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;
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);
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';
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)
{
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();
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) {
if ((global.c_flags & CLEARSCR))
nmh_clear_screen ();
else
- printf ("\n\n\n");
+ puts("\n\n");
}
printf (">>> %s\n\n", mname);
}
if (ofilec > 1) {
if (SOprintf ("Press <return> to list \"%s\"...", mname)) {
if (ofilen > 1)
- printf ("\n\n\n");
+ puts("\n\n");
printf ("Press <return> to list \"%s\"...", mname);
}
fflush (stdout);
default:
if (ofilec > 1) {
if (ofilen > 1) {
- printf ("\n\n\n");
+ puts("\n\n");
if (clearflg > 0)
nmh_clear_screen ();
}
}
}
+ 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);
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;
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;
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);
}
!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;
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;
}
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);
}
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);
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;
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;
*onelp++ = 0;
break;
}
- else
- if (!spc) {
- *cp++ = ' ';
- spc++;
- }
+ if (!spc) {
+ *cp++ = ' ';
+ spc++;
+ }
}
else {
*cp++ = *onelp;
putch ('\n', flags);
if (ovoff > 0)
lm = ovoff;
- putstr (ovtxt ? ovtxt : "", flags);
+ putstr (FENDNULL(ovtxt), flags);
putch (ch, flags);
return;
}
exitstat = status;
if (mhl_action)
longjmp (mhlenv, DONE);
- else
- done (exitstat);
+ done (exitstat);
}
*/
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];
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) {
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);
}
/*
projects / nmh / blobdiff