-
-/*
- * 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/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 <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])
#define DATEFMT 0x000800 /* contains dates */
#define FORMAT 0x001000 /* parse address/date/RFC-2047 field */
#define INIT 0x002000 /* initialize component */
+#define RTRIM 0x004000 /* trim trailing whitespace */
#define SPLIT 0x010000 /* split headers (don't concatenate) */
#define NONEWLINE 0x020000 /* don't write trailing newline */
#define NOWRAP 0x040000 /* Don't wrap lines ever */
#define FMTFILTER 0x080000 /* Filter through format filter */
-#define LBITS "\020\01NOCOMPONENT\02UPPERCASE\03CENTER\04CLEARTEXT\05EXTRA\06HDROUTPUT\07CLEARSCR\010LEFTADJUST\011COMPRESS\012ADDRFMT\013BELL\014DATEFMT\015FORMAT\016INIT\021SPLIT\022NONEWLINE\023NOWRAP\024FMTFILTER"
+#define INVISIBLE 0x100000 /* count byte in display columns? */
+#define FORCE7BIT 0x200000 /* don't display 8-bit bytes */
+#define LBITS "\020\01NOCOMPONENT\02UPPERCASE\03CENTER\04CLEARTEXT\05EXTRA\06HDROUTPUT\07CLEARSCR\010LEFTADJUST\011COMPRESS\012ADDRFMT\013BELL\014DATEFMT\015FORMAT\016INIT\017RTRIM\021SPLIT\022NONEWLINE\023NOWRAP\024FMTFILTER\025INVISIBLE\026FORCE7BIT"
#define GFLAGS (NOCOMPONENT | UPPERCASE | CENTER | LEFTADJUST | COMPRESS | SPLIT | NOWRAP)
/*
int c_width; /* width of field */
int c_cwidth; /* width of component */
int c_length; /* length in lines */
- long c_flags;
+ unsigned long c_flags;
struct mcomp *c_next;
};
struct pair {
char *p_name;
- long p_flags;
+ unsigned long p_flags;
};
static struct pair pairs[] = {
struct triple {
char *t_name;
- long t_on;
- long t_off;
+ unsigned long t_on;
+ unsigned long t_off;
};
static struct triple triples[] = {
{ "nocompress", 0, COMPRESS },
{ "split", SPLIT, 0 },
{ "nosplit", 0, SPLIT },
+ { "rtrim", RTRIM, 0 },
+ { "nortrim", 0, RTRIM },
{ "addrfield", ADDRFMT, DATEFMT },
{ "bell", BELL, 0 },
{ "nobell", 0, BELL },
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
*/
static char *parse (void);
static void process (char *, char *, int, int);
static void mhlfile (FILE *, char *, int, int);
-static int mcomp_flags (char *);
-static char *mcomp_add (long, char *, 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 free_queue (struct mcomp **, struct mcomp **);
static void putcomp (struct mcomp *, struct mcomp *, int);
-static char *oneline (char *, long);
-static void putstr (char *, long);
-static void putch (char, long);
+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);
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;
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]);
- 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++;
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;
case LENSW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ mhladios (NULL, "missing argument to %s", argp[-2]);
if ((length = atoi (cp)) < 1)
- adios (NULL, "bad argument %s %s", argp[-2], cp);
+ mhladios (NULL, "bad argument %s %s", argp[-2], cp);
continue;
case WIDTHSW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ mhladios (NULL, "missing argument to %s", argp[-2]);
if ((width = atoi (cp)) < 1)
- adios (NULL, "bad argument %s %s", argp[-2], cp);
+ 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]);
+ mhladios (NULL, "missing argument to %s", argp[-2]);
if ((issue = atoi (cp)) < 1)
- adios (NULL, "bad argument %s %s", argp[-2], cp);
+ mhladios (NULL, "bad argument %s %s", argp[-2], cp);
continue;
case VOLUMSW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ mhladios (NULL, "missing argument to %s", argp[-2]);
if ((volume = atoi (cp)) < 1)
- adios (NULL, "bad argument %s %s", argp[-2], cp);
+ 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:
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);
if (forwall) {
if (digest) {
- printf ("%s", delim4);
+ fputs(delim4, stdout);
if (volume == 0) {
snprintf (buf, sizeof(buf), "End of %s Digest\n", digest);
} else {
*cp++ = '*';
*cp++ = '\n';
*cp = 0;
- printf ("%s", buf);
+ fputs(buf, stdout);
}
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)
mhl_format (char *file, int length, int width)
{
int i;
- char *bp, *cp, **ip;
- char *ap, buffer[BUFSIZ], name[NAMESZ];
+ char *bp, **ip;
+ char *ap, name[NAMESZ];
struct mcomp *c1;
struct stat st;
FILE *fp;
&& dev == st.st_dev
&& ino == st.st_ino)
goto out;
- else
- free_queue (&fmthd, &fmttl);
+ free_queue (&fmthd, &fmttl);
}
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;
if (*bp == ';')
continue;
- if ((cp = strchr(bp, '\n')))
- *cp = 0;
+ trim_suffix_c(bp, '\n');
if (*bp == ':') {
- c1 = add_queue (&fmthd, &fmttl, NULL, bp + 1, CLEARTEXT);
+ (void) add_queue (&fmthd, &fmttl, NULL, bp + 1, CLEARTEXT);
continue;
}
int n = 0;
/* split the fields */
- tmparray = brkstring (getcpy (++parptr), ",", NULL);
+ tmparray = brkstring (mh_xstrdup(++parptr), ",", NULL);
/* count number of fields split */
p = tmparray;
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++;
}
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) {
if (global.c_flags & DATEFMT) {
- c1->c_nfs = getcpy (global.c_nfs);
+ 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 = getcpy (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);
if (mhldebug) {
for (c1 = fmthd; c1; c1 = c1->c_next) {
+ char buffer[BUFSIZ];
+
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);
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)) {
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;
}
- args = (struct arglist *) calloc((size_t) 1, sizeof(struct arglist));
+ NEW0(args);
if (arglist_tail)
arglist_tail->a_next = args;
char *cp;
if (*parptr++ != '=' || !*(cp = parse ())) {
- advise (NULL, "missing argument to variable %s", name);
+ inform("missing argument to variable %s", name);
return 1;
}
char c, *cp;
if (*parptr++ != '=') {
- advise (NULL, "missing argument to variable %s", name);
+ inform("missing argument to variable %s", name);
return 1;
}
}
c = *parptr;
*parptr = 0;
- *s = getcpy (cp);
+ *s = mh_xstrdup(cp);
if ((*parptr = c) == '"')
parptr++;
return 0;
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';
static void
process (char *folder, char *fname, int ofilen, int ofilec)
{
- char *cp = NULL;
- FILE *fp = NULL;
+ /* static to prevent "might be clobbered" warning from gcc 4.9.2: */
+ static char *cp;
+ static FILE *fp;
struct mcomp *c1;
struct stat st;
struct arglist *ap;
/* volatile to prevent "might be clobbered" warning from gcc: */
char *volatile fname2 = fname ? fname : "(stdin)";
+ cp = NULL;
+ fp = NULL;
+
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++;
} else {
filesize = 0;
}
- cp = folder ? concat (folder, ":", fname2, NULL) : getcpy (fname2);
+ 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) {
fmt_free(ap->a_fmt, 0);
}
if (arglist_head)
- fmt_free(NULL, 1);
+ fmt_free(NULL, 1);
+ /* FALLTHRU */
- default:
+ default:
if (ontty != PITTY)
SIGNAL (SIGINT, SIG_IGN);
- if (mhl_action == NULL && fp != stdin)
+ if (fp != stdin && fp != NULL)
fclose (fp);
- free (cp);
- if (holder.c_text) {
- free (holder.c_text);
- holder.c_text = NULL;
- }
+ free(holder.c_text);
+ holder.c_text = NULL;
free_queue (&msghd, &msgtl);
for (c1 = fmthd; c1; c1 = c1->c_next)
c1->c_flags &= ~HDROUTPUT;
{
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();
if (forwall) {
if (digest)
- printf ("%s", ofilen == 1 ? delim3 : delim4);
+ fputs(ofilen == 1 ? delim3 : delim4, stdout);
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);
}
break;
case ISTTY:
- strncpy (buf, "\n", sizeof(buf));
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);
- buf[0] = 0;
- read (fileno (stdout), buf, sizeof(buf));
}
- if (strchr(buf, '\n')) {
+ if (ofilec == 1 || linefeed_typed()) {
if ((global.c_flags & CLEARSCR))
nmh_clear_screen ();
}
else
- printf ("\n");
+ putchar('\n');
break;
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;
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);
}
}
}
for (ap = pairs; ap->p_name; ap++)
if (!strcasecmp (ap->p_name, name))
- return (ap->p_flags);
+ return ap->p_flags;
return 0;
}
static char *
-mcomp_add (long flags, char *s1, char *s2)
+mcomp_add (unsigned long flags, char *s1, char *s2)
{
char *dp;
{
int dat[5];
char *ap, *cp;
- char buffer[BUFSIZ], error[BUFSIZ];
+ char error[BUFSIZ];
struct pqpair *p, *q;
struct pqpair pq;
struct mailname *mp;
dat[0] = 0;
dat[1] = 0;
dat[2] = filesize;
- dat[3] = sizeof(buffer) - 1;
+ dat[3] = BUFSIZ - 1;
dat[4] = 0;
if (!(c1->c_flags & ADDRFMT)) {
+ charstring_t scanl = charstring_create (BUFSIZ);
+
if (c1->c_c_text)
c1->c_c_text->c_text = ap;
if ((cp = strrchr(ap, '\n'))) /* drop ending newline */
if (!cp[1])
*cp = 0;
- fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1,
- dat, NULL);
+ fmt_scan (c1->c_fmt, scanl, BUFSIZ - 1, dat, NULL);
/* Don't need to append a newline, dctime() already did */
- c2->c_text = getcpy (buffer);
+ c2->c_text = charstring_buffer_copy (scanl);
+ charstring_free (scanl);
/* ap is now owned by the component struct, so do NOT free it here */
return;
(q = &pq)->pq_next = NULL;
while ((cp = getname (ap))) {
- if ((p = (struct pqpair *) calloc ((size_t) 1, sizeof(*p))) == NULL)
- adios (NULL, "unable to allocate pqpair memory");
-
- if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
- p->pq_text = getcpy (cp);
- p->pq_error = getcpy (error);
- } else {
- p->pq_text = getcpy (mp->m_text);
- mnfree (mp);
- }
- q = (q->pq_next = p);
+ NEW0(p);
+ if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
+ p->pq_text = mh_xstrdup(cp);
+ p->pq_error = mh_xstrdup(error);
+ } else {
+ p->pq_text = getcpy (mp->m_text);
+ mnfree (mp);
+ }
+ q = (q->pq_next = p);
}
for (p = pq.pq_next; p; p = q) {
+ charstring_t scanl = charstring_create (BUFSIZ);
+ char *buffer;
+
if (c1->c_c_text) {
c1->c_c_text->c_text = p->pq_text;
p->pq_text = NULL;
p->pq_error = NULL;
}
- fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1,
- dat, NULL);
+ fmt_scan (c1->c_fmt, scanl, BUFSIZ - 1, dat, NULL);
+ buffer = charstring_buffer_copy (scanl);
if (*buffer) {
if (c2->c_text)
c2->c_text = add (",\n", c2->c_text);
*cp = 0;
c2->c_text = add (buffer, c2->c_text);
}
+ charstring_free (scanl);
- if (p->pq_text)
- free (p->pq_text);
- if (p->pq_error)
- free (p->pq_error);
+ free(p->pq_text);
+ free(p->pq_error);
q = p->pq_next;
- free ((char *) p);
+ free(p);
}
c2->c_text = add ("\n", c2->c_text);
{
struct mcomp *c1;
- if ((c1 = (struct mcomp *) calloc ((size_t) 1, sizeof(*c1))) == NULL)
- adios (NULL, "unable to allocate comp memory");
-
+ NEW0(c1);
c1->c_flags = flags & ~INIT;
- if ((c1->c_name = name ? getcpy (name) : NULL))
- c1->c_flags |= mcomp_flags (c1->c_name);
- c1->c_text = text ? getcpy (text) : NULL;
+ if ((c1->c_name = name ? mh_xstrdup(name) : NULL))
+ c1->c_flags |= mcomp_flags (c1->c_name);
+ c1->c_text = text ? mh_xstrdup(text) : NULL;
if (flags & INIT) {
- if (global.c_ovtxt)
- c1->c_ovtxt = getcpy (global.c_ovtxt);
- c1->c_offset = global.c_offset;
- c1->c_ovoff = global. c_ovoff;
- c1->c_width = c1->c_length = 0;
- c1->c_cwidth = global.c_cwidth;
- c1->c_flags |= global.c_flags & GFLAGS;
+ if (global.c_ovtxt)
+ c1->c_ovtxt = mh_xstrdup(global.c_ovtxt);
+ c1->c_offset = global.c_offset;
+ c1->c_ovoff = global. c_ovoff;
+ c1->c_width = c1->c_length = 0;
+ c1->c_cwidth = global.c_cwidth;
+ c1->c_flags |= global.c_flags & GFLAGS;
}
if (*head == NULL)
*head = c1;
for (c1 = *head; c1; c1 = c2) {
c2 = c1->c_next;
- if (c1->c_name)
- free (c1->c_name);
- if (c1->c_text)
- free (c1->c_text);
- if (c1->c_ovtxt)
- free (c1->c_ovtxt);
- if (c1->c_nfs)
- free (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 ((char *) c1);
+ free(c1);
}
*head = *tail = NULL;
static void
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;
char *cp;
+ const int utf8 = strcasecmp(get_charset(), "UTF-8") == 0;
+
+ if (! utf8 && flag != BODYCOMP) {
+ /* Don't print 8-bit bytes in header field values if not in a
+ UTF-8 locale, as required by RFC 6532. */
+ c1->c_flags |= FORCE7BIT;
+ }
+
+ 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(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)
- 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;
if (c1->c_flags & CLEARTEXT) {
- putstr (c1->c_text, c1->c_flags);
+ putstr (c1->c_flags & RTRIM ? rtrim (c1->c_text) : c1->c_text,
+ c1->c_flags);
putstr ("\n", c1->c_flags);
return;
}
count = (c1->c_width ? c1->c_width : global.c_width)
- c1->c_offset - strlen (c2->c_text);
if (!(c1->c_flags & HDROUTPUT) && !(c1->c_flags & NOCOMPONENT))
- count -= strlen (c1->c_text ? c1->c_text : c1->c_name) + 2;
+ count -= strlen(text) + 2;
lm = c1->c_offset + (count / 2);
} else {
if (c1->c_offset)
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 ((unsigned char) *cp))
- *cp = toupper ((unsigned char) *cp);
- putstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags);
+ 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++;
- if ((count = c1->c_cwidth -
- strlen (c1->c_text ? c1->c_text : c1->c_name) - 2) > 0)
+ if ((count = c1->c_cwidth - strlen(text) - 2) > 0)
while (count--)
putstr (" ", c1->c_flags);
}
&& !(c2->c_flags & HDROUTPUT)
&& !(c2->c_flags & NOCOMPONENT)) {
if (c1->c_flags & UPPERCASE)
- for (cp = c2->c_name; *cp; cp++)
- if (islower ((unsigned char) *cp))
- *cp = toupper ((unsigned char) *cp);
+ to_upper(c2->c_name);
putstr (c2->c_name, c1->c_flags);
putstr (": ", c1->c_flags);
if (!(c1->c_flags & SPLIT))
putstr (" ", c1->c_flags);
}
if (c1->c_flags & UPPERCASE)
- for (cp = c2->c_text; *cp; cp++)
- if (islower ((unsigned char) *cp))
- *cp = toupper ((unsigned char) *cp);
+ to_upper(c2->c_text);
count = 0;
if (cchdr) {
: (int) strlen (c2->c_name) + 2;
else
count = (c1->c_cwidth >= 0) ? (size_t) c1->c_cwidth
- : strlen (c1->c_text ? c1->c_text : c1->c_name) + 2;
+ : strlen(text) + 2;
}
count += c1->c_offset;
if ((cp = oneline (c2->c_text, c1->c_flags)))
- putstr(cp, c1->c_flags);
+ /* Output line, trimming trailing whitespace if requested. */
+ putstr (c1->c_flags & RTRIM ? rtrim (cp) : cp, c1->c_flags);
if (term == '\n')
putstr ("\n", c1->c_flags);
while ((cp = oneline (c2->c_text, c1->c_flags))) {
lm = count;
if (flag == BODYCOMP
- && !(c1->c_flags & NOCOMPONENT))
- putstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags);
- if (*cp)
- putstr (cp, c1->c_flags);
+ && !(c1->c_flags & NOCOMPONENT)) {
+ /* Output component, trimming trailing whitespace if there
+ is no text on the line. */
+ if (*cp) {
+ putstr(text, c1->c_flags);
+ } else {
+ putstr (trimmed_prefix, c1->c_flags);
+ }
+ }
+ if (*cp) {
+ /* Output line, trimming trailing whitespace if requested. */
+ putstr (c1->c_flags & RTRIM ? rtrim (cp) : cp, c1->c_flags);
+ }
if (term == '\n')
putstr ("\n", c1->c_flags);
}
if (flag == BODYCOMP && term == '\n')
c1->c_flags &= ~HDROUTPUT; /* Buffer ended on a newline */
+
+ free (trimmed_prefix);
}
static char *
-oneline (char *stuff, long flags)
+oneline (char *stuff, unsigned long flags)
{
int spc;
char *cp, *ret;
if (onelp == NULL)
onelp = stuff;
if (*onelp == 0)
- return (onelp = NULL);
+ return onelp = NULL;
ret = onelp;
term = 0;
*onelp++ = 0;
break;
}
- else
- if (!spc) {
- *cp++ = ' ';
- spc++;
- }
+ if (!spc) {
+ *cp++ = ' ';
+ spc++;
+ }
}
else {
*cp++ = *onelp;
static void
-putstr (char *string, long flags)
+putstr (char *string, unsigned long flags)
{
+ /* To not count, for the purpose of counting columns, all of
+ the bytes of a multibyte character. */
+ int char_len;
+
if (!column && lm > 0) {
while (lm > 0)
if (lm >= 8) {
}
}
lm = 0;
- while (*string)
- putch (*string++, flags);
+
+#ifdef MULTIBYTE_SUPPORT
+ if (mbtowc (NULL, NULL, 0)) {} /* reset shift state */
+ char_len = 0;
+#else
+ NMH_UNUSED (char_len);
+#endif
+
+ while (*string) {
+ flags &= ~INVISIBLE;
+#ifdef MULTIBYTE_SUPPORT
+ /* mbtowc should never return 0, because *string is non-NULL. */
+ if (char_len <= 0) {
+ /* Find number of bytes in next character. */
+ if ((char_len =
+ mbtowc (NULL, string, (size_t) MB_CUR_MAX)) == -1) {
+ char_len = 1;
+ }
+ } else {
+ /* Multibyte character, after the first byte. */
+ flags |= INVISIBLE;
+ }
+
+ --char_len;
+#endif
+ putch (*string++, flags);
+ }
}
static void
-putch (char ch, long flags)
+putch (char ch, unsigned long flags)
{
- char buf[BUFSIZ];
-
if (llim == 0)
return;
if (global.c_flags & BELL)
putchar ('\007');
fflush (stdout);
- buf[0] = 0;
- read (fileno (stdout), buf, sizeof(buf));
- if (strchr(buf, '\n')) {
+ if (linefeed_typed()) {
if (global.c_flags & CLEARSCR)
nmh_clear_screen ();
row = 0;
putchar ('-');
putchar (' ');
}
- if (ch >= ' ')
- column++;
+ /*
+ * Increment the character count, unless
+ * 1) In UTF-8 locale, this is other than the last byte of
+ a multibyte character, or
+ * 2) In C locale, will print a non-printable character.
+ */
+ if ((flags & FORCE7BIT) == 0) {
+ /* UTF-8 locale */
+ if ((flags & INVISIBLE) == 0) {
+ /* If multibyte character, its first byte only. */
+ ++column;
+ }
+ } else {
+ /* If not an ASCII character, the replace character will be
+ displayed. Count it. */
+ if (! isascii((unsigned char) ch) || isprint((unsigned char) ch)) {
+ ++column;
+ }
+ }
break;
}
putch ('\n', flags);
if (ovoff > 0)
lm = ovoff;
- putstr (ovtxt ? ovtxt : "", flags);
+ putstr (FENDNULL(ovtxt), flags);
putch (ch, flags);
return;
}
- putchar (ch);
+ if (flags & FORCE7BIT && ! isascii((unsigned char) ch)) {
+ putchar ('?');
+ } else {
+ putchar (ch);
+ }
+}
+
+/* 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);
}
{
NMH_UNUSED (i);
- done (NOTOK);
+ mhldone (NOTOK);
}
putchar ('\n');
fflush (stdout);
- done (NOTOK);
-}
-
-
-int
-mhlsbr (int argc, char **argv, FILE *(*action)())
-{
- SIGNAL_HANDLER istat = NULL, pstat = NULL, qstat = NULL;
- char *cp = NULL;
- struct mcomp *c1;
- struct arglist *a, *a2;
-
- switch (setjmp (mhlenv)) {
- case OK:
- cp = invo_name;
- sleepsw = 0; /* XXX */
- bellflg = clearflg = forwflg = forwall = exitstat = 0;
- digest = NULL;
- ontty = NOTTY;
- mhl_action = action;
-
- /*
- * If signal is at default action, then start ignoring
- * it, else let it set to its current action.
- */
- if ((istat = SIGNAL (SIGINT, SIG_IGN)) != SIG_DFL)
- SIGNAL (SIGINT, istat);
- if ((qstat = SIGNAL (SIGQUIT, SIG_IGN)) != SIG_DFL)
- SIGNAL (SIGQUIT, qstat);
- pstat = SIGNAL (SIGPIPE, pipeser);
- mhl (argc, argv); /* FALL THROUGH! */
-
- default:
- SIGNAL (SIGINT, istat);
- SIGNAL (SIGQUIT, qstat);
- SIGNAL (SIGPIPE, SIG_IGN);/* should probably change to block instead */
- if (ontty == PITTY)
- m_pclose ();
- SIGNAL (SIGPIPE, pstat);
- invo_name = cp;
- if (holder.c_text) {
- free (holder.c_text);
- holder.c_text = NULL;
- }
- free_queue (&msghd, &msgtl);
- for (c1 = fmthd; c1; c1 = c1->c_next)
- c1->c_flags &= ~HDROUTPUT;
-
- a = arglist_head;
- while (a) {
- if (a->a_nfs)
- free(a->a_nfs);
- a2 = a->a_next;
- free(a);
- a = a2;
- }
- return exitstat;
- }
+ mhldone (NOTOK);
}
-#undef adios
-#undef done
static void
mhladios (char *what, char *fmt, ...)
mhldone (int status)
{
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) {
int bufsz2 = bufsz;
- write(fdinput[1], buf, strlen(buf));
- state = m_getfld (&gstate, name, buf, &bufsz2, fp);
+ if (write(fdinput[1], buf, strlen(buf)) < 0) {
+ advise ("pipe output", "write");
+ }
+ state = m_getfld2(&gstate, name, buf, &bufsz2);
}
/*
*/
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, NULL);
+ charstring_t scanl = charstring_create (BUFSIZ);
+
+ fmt_scan(a->a_fmt, scanl, BUFSIZ, dat, NULL);
+ args[i] = charstring_buffer_copy (scanl);
+ charstring_free (scanl);
/*
* fmt_scan likes to put a trailing newline at the end of the
* format string. If we have one, get rid of it.
*/
s = strlen(args[i]);
if (args[i][s - 1] == '\n')
- args[i][s - 1] = '\0';
+ args[i][s - 1] = '\0';
if (mhldebug)
- fprintf(stderr, "filterarg: fmt=\"%s\", output=\"%s\"\n",
+ fprintf(stderr, "filterarg: fmt=\"%s\", output=\"%s\"\n",
a->a_nfs, args[i]);
}
- if (dup2(fdinput[0], STDIN_FILENO) < 0) {
+ if (dup2(fdinput[0], STDIN_FILENO) < 0) {
adios("formatproc", "Unable to dup2() standard input");
}
if (dup2(fdoutput[1], STDOUT_FILENO) < 0) {
projects / nmh / blobdiff