X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhl.c;h=20f5d31f8bb5998e1655855ed57bcd78f3e58d2f;hp=b1410ad1a4fad201d2e4f1c508cc70ad67d19138;hb=a87df3543d3bc128ba4079d1f95638476ba5ca50;hpb=b7764c4a6b71d37918a97594d866258f154017ca diff --git a/uip/mhl.c b/uip/mhl.c index b1410ad..20f5d31 100644 --- a/uip/mhl.c +++ b/uip/mhl.c @@ -12,8 +12,11 @@ #include #include #include -#include #include +#include +#include +#include +#include /* ** MAJOR BUG: @@ -40,42 +43,20 @@ #define QUOTE '\\' -static struct swit mhlswitches[] = { -#define BELLSW 0 - { "bell", 0 }, -#define NBELLSW 1 - { "nobell", 0 }, -#define CLRSW 2 - { "clear", 0 }, -#define NCLRSW 3 - { "noclear", 0 }, -#define FOLDSW 4 - { "folder +folder", 0 }, -#define FORMSW 5 +static struct swit switches[] = { +#define FORMSW 0 { "form formfile", 0 }, -#define PROGSW 6 - { "moreproc program", 0 }, -#define LENSW 7 - { "length lines", 0 }, -#define WIDTHSW 8 +#define WIDTHSW 1 { "width columns", 0 }, -#define SLEEPSW 9 - { "sleep seconds", 0 }, -#define VERSIONSW 10 - { "version", 0 }, -#define HELPSW 11 +#define VERSIONSW 2 + { "Version", 0 }, +#define HELPSW 3 { "help", 0 }, -#define FORW1SW 12 +#define FORW1SW 4 { "forward", -7 }, -#define FORW2SW 13 +#define FORW2SW 5 { "forwall", -7 }, -#define DGSTSW 14 - { "digest list", -6 }, -#define VOLUMSW 15 - { "volume number", -6 }, -#define ISSUESW 16 - { "issue number", -5 }, -#define NBODYSW 17 +#define NBODYSW 6 { "nobody", -6 }, { NULL, 0 } }; @@ -86,30 +67,27 @@ static struct swit mhlswitches[] = { #define CLEARTEXT 0x000008 /* cleartext */ #define EXTRA 0x000010 /* an "extra" component */ #define HDROUTPUT 0x000020 /* already output */ -#define CLEARSCR 0x000040 /* clear screen */ -#define LEFTADJUST 0x000080 /* left justify multiple lines */ -#define COMPRESS 0x000100 /* compress text */ -#define ADDRFMT 0x000200 /* contains addresses */ -#define BELL 0x000400 /* sound bell at EOP */ -#define DATEFMT 0x000800 /* contains dates */ -#define FORMAT 0x001000 /* parse address/date/RFC-2047 field */ -#define INIT 0x002000 /* initialize component */ -#define SPLIT 0x004000 /* split headers (don't concatenate) */ -#define NONEWLINE 0x008000 /* don't write trailing newline */ -#define LBITS "\020\01NOCOMPONENT\02UPPERCASE\03CENTER\04CLEARTEXT\05EXTRA\06HDROUTPUT\07CLEARSCR\010LEFTADJUST\011COMPRESS\012ADDRFMT\013BELL\014DATEFMT\015FORMAT\016INIT\017SPLIT\020NONEWLINE" +#define LEFTADJUST 0x000040 /* left justify multiple lines */ +#define COMPRESS 0x000080 /* compress text */ +#define ADDRFMT 0x000100 /* contains addresses */ +#define DATEFMT 0x000200 /* contains dates */ +#define FORMAT 0x000400 /* parse address/date/RFC-2047 field */ +#define INIT 0x000800 /* initialize component */ +#define SPLIT 0x001000 /* split headers (don't concatenate) */ +#define NONEWLINE 0x002000 /* don't write trailing newline */ +#define LBITS "\020\01NOCOMPONENT\02UPPERCASE\03CENTER\04CLEARTEXT\05EXTRA\06HDROUTPUT\07LEFTADJUST\010COMPRESS\011ADDRFMT\012DATEFMT\013FORMAT\014INIT\015SPLIT\016NONEWLINE" #define GFLAGS (NOCOMPONENT | UPPERCASE | CENTER | LEFTADJUST | COMPRESS | SPLIT) struct mcomp { char *c_name; /* component name */ char *c_text; /* component text */ char *c_ovtxt; /* text overflow indicator */ - char *c_nfs; /* iff FORMAT */ + char *c_fstr; /* iff FORMAT */ struct format *c_fmt; /* .. */ int c_offset; /* left margin indentation */ int c_ovoff; /* overflow indentation */ int c_width; /* width of field */ int c_cwidth; /* width of component */ - int c_length; /* length in lines */ long c_flags; struct mcomp *c_next; }; @@ -120,11 +98,11 @@ static struct mcomp *fmthd = NULL; static struct mcomp *fmttl = NULL; static struct mcomp global = { - NULL, NULL, "", NULL, NULL, 0, -1, 80, -1, 40, BELL, 0 + NULL, NULL, NULL, NULL, NULL, 0, -1, 80, -1, 0, NULL }; static struct mcomp holder = { - NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, NOCOMPONENT, 0 + NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NOCOMPONENT, NULL }; struct pair { @@ -162,9 +140,6 @@ static struct triple triples[] = { { "nouppercase", 0, UPPERCASE }, { "center", CENTER, 0 }, { "nocenter", 0, CENTER }, - { "clearscreen", CLEARSCR, 0 }, - { "noclearscreen", 0, CLEARSCR }, - { "noclear", 0, CLEARSCR }, { "leftadjust", LEFTADJUST, 0 }, { "noleftadjust", 0, LEFTADJUST }, { "compress", COMPRESS, 0 }, @@ -172,8 +147,6 @@ static struct triple triples[] = { { "split", SPLIT, 0 }, { "nosplit", 0, SPLIT }, { "addrfield", ADDRFMT, DATEFMT }, - { "bell", BELL, 0 }, - { "nobell", 0, BELL }, { "datefield", DATEFMT, ADDRFMT }, { "newline", 0, NONEWLINE }, { "nonewline", NONEWLINE, 0 }, @@ -181,34 +154,19 @@ static struct triple triples[] = { }; -static int bellflg = 0; -static int clearflg = 0; static int dobody = 1; static int forwflg = 0; static int forwall = 0; -static int sleepsw = NOTOK; - -static char *digest = NULL; -static int volume = 0; -static int issue = 0; - static int exitstat = 0; static int mhldebug = 0; -#define PITTY (-1) -#define NOTTY 0 -#define ISTTY 1 -static int ontty = NOTTY; - -static int row; -static int column; +static unsigned int column; static int lm; -static int llim; static int ovoff; static int term; -static int wid; +static unsigned int wid; static char *ovtxt; @@ -219,32 +177,22 @@ static char *parptr; static int num_ignores = 0; static char *ignores[MAXARGS]; -static jmp_buf env; -static jmp_buf mhlenv; - -static char delim3[] = -"\n----------------------------------------------------------------------\n\n"; -static char delim4[] = "\n------------------------------\n\n"; - -static FILE *(*mhl_action) () = (FILE *(*) ()) 0; - +volatile sig_atomic_t eflag = 0; /* ** Redefine a couple of functions. ** These are undefined later in the code. */ -#define adios mhladios -#define done mhldone /* ** prototypes */ -static void mhl_format(char *, int, int); +static void mhl_format(char *, int); static int evalvar(struct mcomp *); static int ptoi(char *, int *); static int ptos(char *, char **); static char *parse(void); -static void process(char *, char *, int, int); +static void process(char *, int, int); static void mhlfile(FILE *, char *, int, int); static int mcomp_flags(char *); static char *mcomp_add(long, char *, char *); @@ -256,34 +204,20 @@ static void putcomp(struct mcomp *, struct mcomp *, int); static char *oneline(char *, long); static void putstr(char *); static void putch(char); -static RETSIGTYPE intrser(int); -static RETSIGTYPE pipeser(int); -static RETSIGTYPE quitser(int); -static void mhladios(char *, char *, ...); -static void mhldone(int); -static void m_popen(char *); - -void m_pclose(void); +static void intrser(int); -void clear_screen(void); /* from termsbr.c */ -int SOprintf(char *, ...); /* from termsbr.c */ int sc_width(void); /* from termsbr.c */ -int sc_length(void); /* from termsbr.c */ int main(int argc, char **argv) { - int length = 0; int i, width = 0, vecp = 0; - char *cp, *folder = NULL, *form = NULL; + char *cp, *form = NULL; char buf[BUFSIZ], *files[MAXARGS]; char **argp, **arguments; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif - invo_name = mhbasename(argv[0]); /* read user profile/context */ @@ -297,96 +231,33 @@ main(int argc, char **argv) while ((cp = *argp++)) { if (*cp == '-') { - switch (smatch(++cp, mhlswitches)) { + switch (smatch(++cp, switches)) { case AMBIGSW: - ambigsw(cp, mhlswitches); - done(1); + ambigsw(cp, switches); + exit(EX_USAGE); case UNKWNSW: - adios(NULL, "-%s unknown\n", cp); + adios(EX_USAGE, NULL, "-%s unknown\n", cp); case HELPSW: snprintf(buf, sizeof(buf), "%s [switches] [files ...]", invo_name); - print_help(buf, mhlswitches, 1); - done(1); + print_help(buf, switches, 1); + exit(argc == 2 ? EX_OK : EX_USAGE); case VERSIONSW: print_version(invo_name); - done(1); - - case BELLSW: - bellflg = 1; - continue; - case NBELLSW: - bellflg = -1; - continue; + exit(argc == 2 ? EX_OK : EX_USAGE); - case CLRSW: - clearflg = 1; - continue; - case NCLRSW: - clearflg = -1; - continue; - - case FOLDSW: - if (!(folder = *argp++) || *folder == '-') - adios(NULL, "missing argument to %s", - argp[-2]); - continue; case FORMSW: if (!(form = *argp++) || *form == '-') - adios(NULL, "missing argument to %s", - argp[-2]); - continue; - - case SLEEPSW: - if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", + adios(EX_USAGE, 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]); - continue; - - case LENSW: - if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", - argp[-2]); - if ((length = atoi(cp)) < 1) - adios(NULL, "bad argument %s %s", - argp[-2], cp); - continue; case WIDTHSW: if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); if ((width = atoi(cp)) < 1) - adios(NULL, "bad argument %s %s", - argp[-2], cp); - continue; - - case DGSTSW: - if (!(digest = *argp++) || - *digest == '-') - adios(NULL, "missing argument to %s", - argp[-2]); - continue; - case ISSUESW: - if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", - argp[-2]); - if ((issue = atoi(cp)) < 1) - adios(NULL, "bad argument %s %s", - argp[-2], cp); - continue; - case VOLUMSW: - if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", - argp[-2]); - if ((volume = atoi(cp)) < 1) - adios(NULL, "bad argument %s %s", + adios(EX_USAGE, NULL, "bad argument %s %s", argp[-2], cp); continue; @@ -394,7 +265,6 @@ main(int argc, char **argv) forwall++; /* fall */ case FORW1SW: forwflg++; - clearflg = -1;/* XXX */ continue; case NBODYSW: @@ -405,76 +275,34 @@ main(int argc, char **argv) files[vecp++] = cp; } - if (!folder) - folder = getenv("mhfolder"); - - if (isatty(fileno(stdout))) { - if (moreproc && *moreproc) { - if (mhl_action) { - SIGNAL(SIGINT, SIG_IGN); - SIGNAL2(SIGQUIT, quitser); - } - SIGNAL2(SIGPIPE, pipeser); - m_popen(moreproc); - ontty = PITTY; - } else { - SIGNAL(SIGINT, SIG_IGN); - SIGNAL2(SIGQUIT, quitser); - ontty = ISTTY; - } - } else { - ontty = NOTTY; - } - - mhl_format(form ? form : mhlformat, length, width); + mhl_format(form ? form : mhlformat, width); if (vecp == 0) { - process(folder, NULL, 1, vecp = 1); + process(NULL, 1, vecp = 1); } else { for (i = 0; i < vecp; i++) - process(folder, files[i], i + 1, vecp); + process(files[i], i + 1, vecp); } if (forwall) { - if (digest) { - printf("%s", delim4); - if (volume == 0) { - snprintf(buf, sizeof(buf), - "End of %s Digest\n", digest); - } else { - snprintf(buf, sizeof(buf), "End of %s Digest [Volume %d Issue %d]\n", digest, volume, issue); - } - i = strlen(buf); - for (cp = buf + i; i > 1; i--) - *cp++ = '*'; - *cp++ = '\n'; - *cp = 0; - printf("%s", buf); - } else - printf("\n------- End of Forwarded Message%s\n\n", + printf("\n------- End of Forwarded Message%s\n\n", vecp > 1 ? "s" : ""); } fflush(stdout); if (ferror(stdout)) { - adios("output", "error writing"); + adios(EX_IOERR, "output", "error writing"); } - if (clearflg > 0 && ontty == NOTTY) - clear_screen(); - - if (ontty == PITTY) - m_pclose(); - return exitstat; } static void -mhl_format(char *file, int length, int width) +mhl_format(char *file, int width) { int i; - char *bp, *cp, **ip; + char *bp, *cp; char *ap, buffer[BUFSIZ], name[NAMESZ]; struct mcomp *c1; struct stat st; @@ -494,7 +322,7 @@ mhl_format(char *file, int length, int width) } if ((fp = fopen(etcpath(file), "r")) == NULL) - adios(file, "unable to open format file"); + adios(EX_IOERR, file, "unable to open format file"); if (fstat(fileno(fp), &st) != NOTOK) { mtime = st.st_mtime; @@ -502,17 +330,15 @@ mhl_format(char *file, int length, int width) ino = st.st_ino; } - global.c_ovtxt = global.c_nfs = NULL; + global.c_ovtxt = global.c_fstr = NULL; global.c_fmt = NULL; global.c_offset = 0; global.c_ovoff = -1; if ((i = sc_width()) > 5) global.c_width = i; global.c_cwidth = -1; - if ((i = sc_length()) > 5) - global.c_length = i - 1; - global.c_flags = BELL; /* BELL is default */ - *(ip = ignores) = NULL; + global.c_flags = 0; + *ignores = NULL; while (vfgets(fp, &ap) == OK) { bp = ap; @@ -539,31 +365,26 @@ mhl_format(char *file, int length, int width) ** it to the end of the current "ignores" list. */ if (!mh_strcasecmp(name, "ignores")) { - char **tmparray, **p; + char **tmparray; int n = 0; /* split the fields */ tmparray = brkstring(getcpy(++parptr), ",", NULL); - - /* count number of fields split */ - p = tmparray; - while (*p++) - n++; - /* ** copy pointers to split fields ** to ignores array */ - ip = copyip(tmparray, ip, - MAXARGS - num_ignores); - num_ignores += n; + while (tmparray[n] && num_ignoresc_nfs && global.c_nfs) { + if (!c1->c_fstr && global.c_fstr) { if ((c1->c_flags & DATEFMT) && (global.c_flags & DATEFMT)) { - c1->c_nfs = getcpy(global.c_nfs); + c1->c_fstr = getcpy(global.c_fstr); } else if ((c1->c_flags & ADDRFMT) && (global.c_flags & ADDRFMT)) { - c1->c_nfs = getcpy(global.c_nfs); + c1->c_fstr = getcpy(global.c_fstr); } } continue; default: - adios(NULL, "format file syntax error: %s", bp); + adios(EX_CONFIG, NULL, "format file syntax error: %s", bp); } } fclose(fp); @@ -596,35 +417,15 @@ mhl_format(char *file, int length, int width) if (mhldebug) { for (c1 = fmthd; c1; c1 = c1->c_next) { 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, "\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); + fprintf(stderr, "\tfstr=0x%x fmt=0x%x\n", (unsigned int)(unsigned long) c1->c_fstr, (unsigned int)(unsigned long) c1->c_fmt); + fprintf(stderr, "\toffset=%d ovoff=%d width=%d cwidth=%d\n", c1->c_offset, c1->c_ovoff, c1->c_width, c1->c_cwidth); fprintf (stderr, "\tflags=%s\n", snprintb(buffer, sizeof(buffer), (unsigned) c1->c_flags, LBITS)); } } out: - if (clearflg == 1) { - global.c_flags |= CLEARSCR; - } else { - if (clearflg == -1) - global.c_flags &= ~CLEARSCR; - } - - switch (bellflg) { /* command line may override format file */ - case 1: - global.c_flags |= BELL; - break; - case -1: - global.c_flags &= ~BELL; - break; - } - - if (length) - global.c_length = length; if (width) global.c_width = width; - if (global.c_length < 5) - global.c_length = 10000; if (global.c_width < 5) global.c_width = 10000; } @@ -651,23 +452,23 @@ evalvar(struct mcomp *c1) return ptos(name, &c1->c_ovtxt); if (!mh_strcasecmp(name, "formatfield")) { - char *nfs; + char *fmtstr; if (ptos(name, &cp)) return 1; cp = concat("=", cp, NULL); - nfs = new_fs(cp, NULL); + fmtstr = new_fs(cp, NULL); free(cp); - c1->c_nfs = getcpy(nfs); + c1->c_fstr = getcpy(fmtstr); c1->c_flags |= FORMAT; return 0; } if (!mh_strcasecmp(name, "decode")) { - char *nfs; + char *fmtstr; - nfs = new_fs("=%(decode{text})", NULL); - c1->c_nfs = getcpy(nfs); + fmtstr = new_fs("=%(decode{text})", NULL); + c1->c_fstr = getcpy(fmtstr); c1->c_flags |= FORMAT; return 0; } @@ -680,8 +481,6 @@ evalvar(struct mcomp *c1) return ptoi(name, &c1->c_width); if (!mh_strcasecmp(name, "compwidth")) return ptoi(name, &c1->c_cwidth); - if (!mh_strcasecmp(name, "length")) - return ptoi(name, &c1->c_length); for (ap = triples; ap->t_name; ap++) if (!mh_strcasecmp(ap->t_name, name)) { @@ -764,158 +563,101 @@ parse(void) static void -process(char *folder, char *fname, int ofilen, int ofilec) +process(char *fname, int ofilen, int ofilec) { - char *cp = NULL; FILE *fp = NULL; struct mcomp *c1; - switch (setjmp(env)) { - case OK: - if (fname) { - fp = mhl_action ? (*mhl_action) (fname) : - fopen(fname, "r"); - if (fp == NULL) { - advise(fname, "unable to open"); - exitstat++; - return; - } - } else { - fname = "(stdin)"; - fp = stdin; - } - cp = folder ? concat(folder, ":", fname, NULL) : getcpy(fname); - if (ontty != PITTY) - SIGNAL(SIGINT, intrser); - mhlfile(fp, cp, ofilen, ofilec); /* FALL THROUGH! */ - - default: - if (ontty != PITTY) - SIGNAL(SIGINT, SIG_IGN); - if (mhl_action == NULL && fp != stdin) - fclose(fp); - free(cp); - if (holder.c_text) { - free(holder.c_text); - holder.c_text = NULL; + if (fname) { + fp = fopen(fname, "r"); + if (fp == NULL) { + advise(fname, "unable to open"); + exitstat++; + return; } - free_queue(&msghd, &msgtl); - for (c1 = fmthd; c1; c1 = c1->c_next) - c1->c_flags &= ~HDROUTPUT; - break; + } else { + fname = "(stdin)"; + fp = stdin; + } + SIGNAL(SIGINT, intrser); + mhlfile(fp, fname, ofilen, ofilec); + + SIGNAL(SIGINT, SIG_IGN); + if (fp != stdin) + fclose(fp); + 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; } static void mhlfile(FILE *fp, char *mname, int ofilen, int ofilec) { - int state; + enum state state; + struct field f = free_field; struct mcomp *c1, *c2, *c3; - char **ip, name[NAMESZ], buf[BUFSIZ]; + char **ip; if (forwall) { - if (digest) - printf("%s", ofilen == 1 ? delim3 : delim4); - else { - printf("\n-------"); - if (ofilen == 1) - printf(" Forwarded Message%s", - ofilec > 1 ? "s" : ""); - else - printf(" Message %d", ofilen); - printf("\n\n"); + printf("\n-------"); + if (ofilen == 1) { + printf(" Forwarded Message%s", ofilec > 1 ? "s" : ""); + } else { + printf(" Message %d", ofilen); } - } else { - switch (ontty) { - case PITTY: - if (ofilec > 1) { - if (ofilen > 1) { - if ((global.c_flags & CLEARSCR)) - clear_screen(); - else - printf("\n\n\n"); - } - printf(">>> %s\n\n", mname); - } - break; - - case ISTTY: - strncpy(buf, "\n", sizeof(buf)); - if (ofilec > 1) { - if (SOprintf("Press to list \"%s\"...", mname)) { - if (ofilen > 1) - printf("\n\n\n"); - printf("Press to list \"%s\"...", mname); - } - fflush(stdout); - buf[0] = 0; - read(fileno(stdout), buf, sizeof(buf)); - } - if (strchr(buf, '\n')) { - if ((global.c_flags & CLEARSCR)) - clear_screen(); - } else - printf("\n"); - break; - - default: - if (ofilec > 1) { - if (ofilen > 1) { - printf("\n\n\n"); - if (clearflg > 0) - clear_screen(); - } - printf(">>> %s\n\n", mname); - } - break; + printf("\n\n"); + } else if (ofilec > 1) { + if (ofilen > 1) { + printf("\n\n\n"); } + printf(">>> %s\n\n", mname); } - for (state = FLD;;) { - switch (state = m_getfld(state, name, buf, sizeof(buf), fp)) { - case FLD: - case FLDPLUS: + for (state = FLD2; !eflag; ) { + switch (state = m_getfld2(state, &f, fp)) { + case FLD2: for (ip = ignores; *ip; ip++) - if (!mh_strcasecmp(name, *ip)) { - while (state == FLDPLUS) - state = m_getfld(state, name, buf, sizeof(buf), fp); + if (mh_strcasecmp(f.name, *ip)==0) { break; } - if (*ip) + if (*ip) { continue; + } for (c2 = fmthd; c2; c2 = c2->c_next) - if (!mh_strcasecmp(c2->c_name, name)) + if (mh_strcasecmp(c2->c_name, f.name)==0) { 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)) { - c1->c_text = mcomp_add(c1->c_flags, buf, c1->c_text); + if (mh_strcasecmp(c1->c_name, + c3->c_name)==0) { + c1->c_text = mcomp_add(c1->c_flags, f.value, c1->c_text); break; } - if (c1 == NULL) - c1 = add_queue(&msghd, &msgtl, name, buf, 0); - while (state == FLDPLUS) { - state = m_getfld(state, name, buf, - sizeof(buf), fp); - c1->c_text = add(buf, c1->c_text); + if (c1 == NULL) { + c1 = add_queue(&msghd, &msgtl, f.name, f.value, 0); } - if (c2 == NULL) + if (c2 == NULL) { c1->c_flags |= EXTRA; + } continue; - case BODY: - case FILEEOF: - row = column = 0; + case BODY2: + case FILEEOF2: + column = 0; for (c1 = fmthd; c1; c1 = c1->c_next) { if (c1->c_flags & CLEARTEXT) { putcomp(c1, c1, ONECOMP); continue; } - if (!mh_strcasecmp(c1->c_name, "messagename")) { + if (mh_strcasecmp(c1->c_name, "messagename")==0) { holder.c_text = concat("(Message ", mname, ")\n", NULL); putcomp(c1, &holder, ONECOMP); @@ -923,41 +665,47 @@ mhlfile(FILE *fp, char *mname, int ofilen, int ofilec) holder.c_text = NULL; continue; } - if (!mh_strcasecmp(c1->c_name, "extras")) { - for (c2 = msghd; c2; c2 = c2->c_next) - if (c2->c_flags & EXTRA) + if (mh_strcasecmp(c1->c_name, "extras")==0) { + 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")) { - holder.c_text = mh_xmalloc(sizeof(buf)); - strncpy(holder.c_text, buf, sizeof(buf)); - while (state == BODY) { + if (dobody && mh_strcasecmp(c1->c_name, "body")==0) { + holder.c_text = getcpy(f.value); + while (state == BODY2) { putcomp(c1, &holder, BODYCOMP); - state = m_getfld(state, name, holder.c_text, sizeof(buf), fp); + state = m_getfld2(state, &f, fp); + free(holder.c_text); + holder.c_text = getcpy(f.value); } free(holder.c_text); holder.c_text = NULL; continue; } - for (c2 = msghd; c2; c2 = c2->c_next) - if (!mh_strcasecmp(c2->c_name, - c1->c_name)) { + for (c2 = msghd; c2; c2 = c2->c_next) { + if (mh_strcasecmp(c2->c_name, + c1->c_name)==0) { putcomp(c1, c2, ONECOMP); - if (!(c1->c_flags & SPLIT)) + if (!(c1->c_flags & SPLIT)) { break; + } } + } } return; - case LENERR: - case FMTERR: + case LENERR2: + case FMTERR2: + case IOERR2: advise(NULL, "format error in message %s", mname); exitstat++; return; default: - adios(NULL, "getfld() returned %d", state); + adios(EX_SOFTWARE, NULL, "getfld() returned %d", state); } } } @@ -1016,7 +764,7 @@ mcomp_format(struct mcomp *c1, struct mcomp *c2) dat[2] = 0; dat[3] = sizeof(buffer) - 1; dat[4] = 0; - fmt_compile(c1->c_nfs, &c1->c_fmt); + fmt_compile(c1->c_fstr, &c1->c_fmt); if (!(c1->c_flags & ADDRFMT)) { FINDCOMP(cptr, "text"); @@ -1036,9 +784,7 @@ mcomp_format(struct mcomp *c1, struct mcomp *c2) (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"); + p = (struct pqpair *) mh_xcalloc((size_t) 1, sizeof(*p)); if ((mp = getm(cp, NULL, 0, AD_NAME, error)) == NULL) { p->pq_text = getcpy(cp); @@ -1085,8 +831,7 @@ add_queue(struct mcomp **head, struct mcomp **tail, char *name, { struct mcomp *c1; - if ((c1 = (struct mcomp *) calloc((size_t) 1, sizeof(*c1))) == NULL) - adios(NULL, "unable to allocate comp memory"); + c1 = (struct mcomp *) mh_xcalloc((size_t) 1, sizeof(*c1)); c1->c_flags = flags & ~INIT; if ((c1->c_name = name ? getcpy(name) : NULL)) @@ -1097,7 +842,7 @@ add_queue(struct mcomp **head, struct mcomp **tail, char *name, 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_width = 0; c1->c_cwidth = global.c_cwidth; c1->c_flags |= global.c_flags & GFLAGS; } @@ -1124,8 +869,8 @@ free_queue(struct mcomp **head, struct mcomp **tail) free(c1->c_text); if (c1->c_ovtxt) free(c1->c_ovtxt); - if (c1->c_nfs) - free(c1->c_nfs); + if (c1->c_fstr) + free(c1->c_fstr); if (c1->c_fmt) free((char *) c1->c_fmt); free((char *) c1); @@ -1143,14 +888,13 @@ putcomp(struct mcomp *c1, struct mcomp *c2, int flag) cchdr = 0; lm = 0; - llim = c1->c_length ? c1->c_length : -1; wid = c1->c_width ? c1->c_width : global.c_width; ovoff = (c1->c_ovoff >= 0 ? c1->c_ovoff : global.c_ovoff) + c1->c_offset; 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)", c1->c_name, wid, ovoff + strlen(ovtxt) + 5); + adios(EX_SOFTWARE, NULL, "component: %s width(%d) too small for overflow(%d)", c1->c_name, wid, ovoff + strlen(ovtxt) + 5); onelp = NULL; if (c1->c_flags & CLEARTEXT) { @@ -1159,7 +903,7 @@ putcomp(struct mcomp *c1, struct mcomp *c2, int flag) return; } - if (c1->c_nfs && (c1->c_flags & (ADDRFMT | DATEFMT | FORMAT))) + if (c1->c_fstr && (c1->c_flags & (ADDRFMT | DATEFMT | FORMAT))) mcomp_format(c1, c2); if (c1->c_flags & CENTER) { @@ -1218,11 +962,11 @@ putcomp(struct mcomp *c1, struct mcomp *c2, int flag) count = 0; if (cchdr) { if (flag == TWOCOMP) - count = (c1->c_cwidth >= 0) ? - c1->c_cwidth : strlen(c2->c_name) + 2; + count = (c1->c_cwidth >= 0) ? c1->c_cwidth : + (int)strlen(c2->c_name) + 2; else - count = (c1->c_cwidth >= 0) ? - c1->c_cwidth : strlen(c1->c_text ? + count = (c1->c_cwidth >= 0) ? (size_t)c1->c_cwidth : + strlen(c1->c_text ? c1->c_text : c1->c_name) + 2; } count += c1->c_offset; @@ -1317,34 +1061,7 @@ putstr(char *string) static void putch(char ch) { - char buf[BUFSIZ]; - - if (llim == 0) - return; - switch (ch) { - case '\n': - if (llim > 0) - llim--; - column = 0; - row++; - if (ontty != ISTTY || row != global.c_length) - break; - if (global.c_flags & BELL) - putchar('\007'); - fflush(stdout); - buf[0] = 0; - read(fileno(stdout), buf, sizeof(buf)); - if (strchr(buf, '\n')) { - if (global.c_flags & CLEARSCR) - clear_screen(); - row = 0; - } else { - putchar('\n'); - row = global.c_length / 3; - } - return; - case '\t': column |= 07; column++; @@ -1354,6 +1071,7 @@ putch(char ch) column--; break; + case '\n': case '\r': column = 0; break; @@ -1385,129 +1103,8 @@ putch(char ch) } -static RETSIGTYPE -intrser(int i) -{ -#ifndef RELIABLE_SIGNALS - SIGNAL(SIGINT, intrser); -#endif - - discard(stdout); - putchar('\n'); - longjmp(env, DONE); -} - - -static RETSIGTYPE -pipeser(int i) -{ -#ifndef RELIABLE_SIGNALS - SIGNAL(SIGPIPE, pipeser); -#endif - - done(NOTOK); -} - - -static RETSIGTYPE -quitser(int i) -{ -#ifndef RELIABLE_SIGNALS - SIGNAL(SIGQUIT, quitser); -#endif - - putchar('\n'); - fflush(stdout); - done(NOTOK); -} - - -#undef adios -#undef done - static void -mhladios(char *what, char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - advertise(what, NULL, fmt, ap); - va_end(ap); - mhldone(1); -} - - -static void -mhldone(int status) -{ - exitstat = status; - if (mhl_action) - longjmp(mhlenv, DONE); - else - done(exitstat); -} - - -static int m_pid = NOTOK; -static int sd = NOTOK; - -static void -m_popen(char *name) -{ - int pd[2]; - - 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]); - } - execlp(name, mhbasename(name), NULL); - 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) +intrser(int i) { - 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; + eflag = 1; }