#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 char *ovtxt;
-static unsigned char *onelp;
+static char *onelp;
static char *parptr;
char buf[BUFSIZ], *files[MAXARGS];
char **argp, **arguments;
- 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);
}
if (clearflg > 0 && ontty == NOTTY)
- clear_screen ();
+ nmh_clear_screen ();
if (ontty == PITTY)
m_pclose ();
* 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;
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;
}
}
+ m_getfld_state_destroy (&gstate);
return;
case LENERR:
case FMTERR:
advise (NULL, "format error in message %s", mname);
exitstat++;
+ m_getfld_state_destroy (&gstate);
return;
default:
adios (NULL, "getfld() returned %d", state);
}
}
- m_getfld_state_destroy (&gstate);
}
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;
if (!cp[1])
*cp = 0;
- fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1, dat);
+ fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1,
+ dat, NULL);
/* Don't need to append a newline, dctime() already did */
c2->c_text = getcpy (buffer);
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 {
p->pq_error = NULL;
}
- fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1, dat);
+ fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1,
+ dat, NULL);
if (*buffer) {
if (c2->c_text)
c2->c_text = add (",\n", c2->c_text);
putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
{
int count, cchdr;
- unsigned char *cp;
+ char *cp;
cchdr = 0;
lm = 0;
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 (*cp))
- *cp = toupper (*cp);
+ if (islower ((unsigned char) *cp))
+ *cp = toupper ((unsigned char) *cp);
putstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags);
if (flag != BODYCOMP) {
putstr (": ", c1->c_flags);
&& !(c2->c_flags & NOCOMPONENT)) {
if (c1->c_flags & UPPERCASE)
for (cp = c2->c_name; *cp; cp++)
- if (islower (*cp))
- *cp = toupper (*cp);
+ if (islower ((unsigned char) *cp))
+ *cp = toupper ((unsigned char) *cp);
putstr (c2->c_name, c1->c_flags);
putstr (": ", c1->c_flags);
if (!(c1->c_flags & SPLIT))
}
if (c1->c_flags & UPPERCASE)
for (cp = c2->c_text; *cp; cp++)
- if (islower (*cp))
- *cp = toupper (*cp);
+ if (islower ((unsigned char) *cp))
+ *cp = toupper ((unsigned char) *cp);
count = 0;
if (cchdr) {
term = 0;
if (flags & COMPRESS) {
for (spc = 1, cp = ret; *onelp; onelp++)
- if (isspace (*onelp)) {
+ if (isspace ((unsigned char) *onelp)) {
if (*onelp == '\n' && (!onelp[1] || (flags & ADDRFMT))) {
term = '\n';
*onelp++ = 0;
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');
if (pipe (pd) == NOTOK)
adios ("pipe", "unable to");
- switch (m_pid = vfork()) {
+ switch (m_pid = fork()) {
case NOTOK:
adios ("fork", "unable to");
* buffers that we have duplicated from the parent.
*/
_exit(0);
- break;
case -1:
adios(NULL, "Unable to fork for filter writer process");
break;
*/
switch (filterpid = fork()) {
- char **args;
+ char **args, *program;
struct arglist *a;
- int i, dat[5], s;
+ int i, dat[5], s, argp;
case 0:
/*
- * Allocate an argument array for us
+ * Configure an argument array for us
*/
- args = (char **) mh_xmalloc((filter_nargs + 2) * sizeof(char *));
- args[0] = formatproc;
- args[filter_nargs + 1] = NULL;
+ args = argsplit(formatproc, &program, &argp);
+ args[argp + filter_nargs] = NULL;
dat[0] = 0;
dat[1] = 0;
dat[2] = 0;
* Pull out each argument and scan them.
*/
- for (a = arglist_head, i = 1; a != NULL; a = a->a_next, i++) {
+ 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);
+ fmt_scan(a->a_fmt, args[i], BUFSIZ - 1, BUFSIZ, dat, NULL);
/*
* fmt_scan likes to put a trailing newline at the end of the
* format string. If we have one, get rid of it.
projects / nmh / blobdiff