#include <h/tws.h>
#include <h/utils.h>
#include <setjmp.h>
-#include <signal.h>
-#include <errno.h>
-#include <sys/wait.h>
#include <sys/types.h>
/*
static void quitser (int);
static void mhladios (char *, char *, ...);
static void mhldone (int);
-static void m_popen (char *);
static void filterbody (struct mcomp *, char *, int, int, FILE *,
m_getfld_state_t);
static void compile_formatfield(struct mcomp *);
char buf[BUFSIZ], *files[MAXARGS];
char **argp, **arguments;
+ /* Need this if called from main() of show(1). */
invo_name = r1bindex (argv[0], '/');
- /* read user profile/context */
- context_read();
-
arguments = getarguments (invo_name, argc, argv, 1);
argp = arguments;
folder = getenv ("mhfolder");
if (isatty (fileno (stdout))) {
- if (!nomore && !sc_hardcopy() && moreproc && *moreproc != '\0') {
+ if (!nomore && moreproc && *moreproc != '\0') {
if (mhl_action) {
SIGNAL (SIGINT, SIG_IGN);
SIGNAL2 (SIGQUIT, quitser);
}
SIGNAL2 (SIGPIPE, pipeser);
- m_popen (moreproc);
+ m_popen (moreproc, mhl_action != NULL);
ontty = PITTY;
} else {
SIGNAL (SIGINT, SIG_IGN);
}
if (clearflg > 0 && ontty == NOTTY)
- clear_screen ();
+ nmh_clear_screen ();
if (ontty == PITTY)
m_pclose ();
{
int i;
char *bp, *cp, **ip;
- char *ap, buffer[BUFSIZ], name[NAMESZ];
+ char *ap, name[NAMESZ];
struct mcomp *c1;
struct stat st;
FILE *fp;
* Split this list of fields to ignore, and copy
* it to the end of the current "ignores" list.
*/
- if (!mh_strcasecmp (name, "ignores")) {
+ if (!strcasecmp (name, "ignores")) {
char **tmparray, **p;
int n = 0;
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",
return 0;
strncpy (name, parse(), sizeof(name));
- if (!mh_strcasecmp (name, "component")) {
+ if (!strcasecmp (name, "component")) {
if (ptos (name, &c1->c_text))
return 1;
c1->c_flags &= ~NOCOMPONENT;
return 0;
}
- if (!mh_strcasecmp (name, "overflowtext"))
+ if (!strcasecmp (name, "overflowtext"))
return ptos (name, &c1->c_ovtxt);
- if (!mh_strcasecmp (name, "formatfield")) {
+ if (!strcasecmp (name, "formatfield")) {
if (ptos (name, &cp))
return 1;
c1->c_nfs = getcpy (new_fs (NULL, NULL, cp));
return 0;
}
- if (!mh_strcasecmp (name, "decode")) {
+ if (!strcasecmp (name, "decode")) {
c1->c_nfs = getcpy (new_fs (NULL, NULL, "%(decode{text})"));
compile_formatfield(c1);
c1->c_flags |= FORMAT;
return 0;
}
- if (!mh_strcasecmp (name, "offset"))
+ if (!strcasecmp (name, "offset"))
return ptoi (name, &c1->c_offset);
- if (!mh_strcasecmp (name, "overflowoffset"))
+ if (!strcasecmp (name, "overflowoffset"))
return ptoi (name, &c1->c_ovoff);
- if (!mh_strcasecmp (name, "width"))
+ if (!strcasecmp (name, "width"))
return ptoi (name, &c1->c_width);
- if (!mh_strcasecmp (name, "compwidth"))
+ if (!strcasecmp (name, "compwidth"))
return ptoi (name, &c1->c_cwidth);
- if (!mh_strcasecmp (name, "length"))
+ if (!strcasecmp (name, "length"))
return ptoi (name, &c1->c_length);
- if (!mh_strcasecmp (name, "nodashstuffing"))
+ if (!strcasecmp (name, "nodashstuffing"))
return (dashstuff = -1);
for (ap = triples; ap->t_name; ap++)
- if (!mh_strcasecmp (ap->t_name, name)) {
+ if (!strcasecmp (ap->t_name, name)) {
c1->c_flags |= ap->t_on;
c1->c_flags &= ~ap->t_off;
return 0;
}
- if (!mh_strcasecmp (name, "formatarg")) {
+ if (!strcasecmp (name, "formatarg")) {
struct arglist *args;
if (ptos (name, &cp))
return 1;
- if (mh_strcasecmp (c1->c_name, "body")) {
+ if (! c1->c_name || strcasecmp (c1->c_name, "body")) {
advise (NULL, "format filters are currently only supported on "
"the \"body\" component");
return 1;
struct mcomp *c1;
struct stat st;
struct arglist *ap;
+ /* volatile to prevent "might be clobbered" warning from gcc: */
+ char *volatile fname2 = fname ? fname : "(stdin)";
switch (setjmp (env)) {
case OK:
return;
}
} else {
- fname = "(stdin)";
fp = stdin;
}
if (fstat(fileno(fp), &st) == 0) {
} else {
filesize = 0;
}
- cp = folder ? concat (folder, ":", fname, NULL) : getcpy (fname);
+ cp = folder ? concat (folder, ":", fname2, NULL) : getcpy (fname2);
if (ontty != PITTY)
SIGNAL (SIGINT, intrser);
mhlfile (fp, cp, ofilen, ofilec); /* FALL THROUGH! */
if (ofilec > 1) {
if (ofilen > 1) {
if ((global.c_flags & CLEARSCR))
- clear_screen ();
+ nmh_clear_screen ();
else
printf ("\n\n\n");
}
}
if (strchr(buf, '\n')) {
if ((global.c_flags & CLEARSCR))
- clear_screen ();
+ nmh_clear_screen ();
}
else
printf ("\n");
if (ofilen > 1) {
printf ("\n\n\n");
if (clearflg > 0)
- clear_screen ();
+ nmh_clear_screen ();
}
printf (">>> %s\n\n", mname);
}
case FLDPLUS:
bucket = fmt_addcomptext(name, buf);
for (ip = ignores; *ip; ip++)
- if (!mh_strcasecmp (name, *ip)) {
+ if (!strcasecmp (name, *ip)) {
while (state == FLDPLUS) {
bufsz = sizeof buf;
state = m_getfld (&gstate, name, buf, &bufsz, fp);
continue;
for (c2 = fmthd; c2; c2 = c2->c_next)
- if (!mh_strcasecmp (c2->c_name, name))
+ if (!strcasecmp (c2->c_name ? c2->c_name : "", name))
break;
c1 = NULL;
if (!((c3 = c2 ? c2 : &global)->c_flags & SPLIT))
for (c1 = msghd; c1; c1 = c1->c_next)
- if (!mh_strcasecmp (c1->c_name, c3->c_name)) {
+ if (!strcasecmp (c1->c_name ? c1->c_name : "",
+ c3->c_name ? c3->c_name : "")) {
c1->c_text =
mcomp_add (c1->c_flags, buf, c1->c_text);
break;
putcomp (c1, c1, ONECOMP);
continue;
}
- if (!mh_strcasecmp (c1->c_name, "messagename")) {
+ if (!c1->c_name ||
+ !strcasecmp (c1->c_name, "messagename")) {
holder.c_text = concat ("(Message ", mname, ")\n",
NULL);
putcomp (c1, &holder, ONECOMP);
holder.c_text = NULL;
continue;
}
- if (!mh_strcasecmp (c1->c_name, "extras")) {
+ if (!c1->c_name || !strcasecmp (c1->c_name, "extras")) {
for (c2 = msghd; c2; c2 = c2->c_next)
if (c2->c_flags & EXTRA)
putcomp (c1, c2, TWOCOMP);
continue;
}
- if (dobody && !mh_strcasecmp (c1->c_name, "body")) {
+ if (dobody && (!c1->c_name ||
+ !strcasecmp (c1->c_name, "body"))) {
if (c1->c_flags & FMTFILTER && state == BODY &&
formatproc != NULL) {
filterbody(c1, buf, sizeof(buf), state, fp, gstate);
continue;
}
for (c2 = msghd; c2; c2 = c2->c_next)
- if (!mh_strcasecmp (c2->c_name, c1->c_name)) {
+ if (!strcasecmp (c2->c_name ? c2->c_name : "",
+ c1->c_name ? c1->c_name : "")) {
putcomp (c1, c2, ONECOMP);
if (!(c1->c_flags & SPLIT))
break;
struct pair *ap;
for (ap = pairs; ap->p_name; ap++)
- if (!mh_strcasecmp (ap->p_name, name))
+ if (!strcasecmp (ap->p_name, name))
return (ap->p_flags);
return 0;
{
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;
if ((p = (struct pqpair *) calloc ((size_t) 1, sizeof(*p))) == NULL)
adios (NULL, "unable to allocate pqpair memory");
- if ((mp = getm (cp, NULL, 0, AD_NAME, error)) == NULL) {
+ if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
p->pq_text = getcpy (cp);
p->pq_error = getcpy (error);
} else {
}
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);
- if (*buffer) {
+ fmt_scan (c1->c_fmt, scanl, BUFSIZ - 1, dat, NULL);
+ buffer = charstring_buffer_copy (scanl);
+ if (strlen (buffer) > 0) {
if (c2->c_text)
c2->c_text = add (",\n", c2->c_text);
if (*(cp = buffer + strlen (buffer) - 1) == '\n')
*cp = 0;
c2->c_text = add (buffer, c2->c_text);
}
+ charstring_free (scanl);
if (p->pq_text)
free (p->pq_text);
read (fileno (stdout), buf, sizeof(buf));
if (strchr(buf, '\n')) {
if (global.c_flags & CLEARSCR)
- clear_screen ();
+ nmh_clear_screen ();
row = 0;
} else {
putchar ('\n');
}
-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;
- }
-}
-
#undef adios
#undef done
}
-static int m_pid = NOTOK;
-static int sd = NOTOK;
-
-static void
-m_popen (char *name)
-{
- int pd[2];
- char *file;
- char **arglist;
-
- if (mhl_action && (sd = dup (fileno (stdout))) == NOTOK)
- adios ("standard output", "unable to dup()");
-
- if (pipe (pd) == NOTOK)
- adios ("pipe", "unable to");
-
- switch (m_pid = fork()) {
- case NOTOK:
- adios ("fork", "unable to");
-
- case OK:
- SIGNAL (SIGINT, SIG_DFL);
- SIGNAL (SIGQUIT, SIG_DFL);
-
- close (pd[1]);
- if (pd[0] != fileno (stdin)) {
- dup2 (pd[0], fileno (stdin));
- close (pd[0]);
- }
- arglist = argsplit(name, &file, NULL);
- execvp (file, arglist);
- fprintf (stderr, "unable to exec ");
- perror (name);
- _exit (-1);
-
- default:
- close (pd[0]);
- if (pd[1] != fileno (stdout)) {
- dup2 (pd[1], fileno (stdout));
- close (pd[1]);
- }
- }
-}
-
-
-void
-m_pclose (void)
-{
- if (m_pid == NOTOK)
- return;
-
- if (sd != NOTOK) {
- fflush (stdout);
- if (dup2 (sd, fileno (stdout)) == NOTOK)
- adios ("standard output", "unable to dup2()");
-
- clearerr (stdout);
- close (sd);
- sd = NOTOK;
- }
- else
- fclose (stdout);
-
- pidwait (m_pid, OK);
- m_pid = NOTOK;
-}
-
-
/*
* Compile a format string used by the formatfield option and save it
* for later.
* buffers that we have duplicated from the parent.
*/
_exit(0);
- break;
case -1:
adios(NULL, "Unable to fork for filter writer process");
break;
*/
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