X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhl.c;h=4c2f06ee642026043e10a83f1add069c8845e78e;hp=017d2f787ed22fed0a576b730272b7dc60af91f7;hb=cebc12618d19409a25e332eef13e825df15a9bc2;hpb=39e87a75b5c2d3572ec72e717720b44af291e88a diff --git a/uip/mhl.c b/uip/mhl.c index 017d2f7..4c2f06e 100644 --- a/uip/mhl.c +++ b/uip/mhl.c @@ -41,41 +41,31 @@ #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 +#define FOLDSW 0 { "folder +folder", 0 }, -#define FORMSW 5 +#define FORMSW 1 { "form formfile", 0 }, -#define PROGSW 6 +#define PROGSW 2 { "moreproc program", 0 }, -#define LENSW 7 - { "length lines", 0 }, -#define WIDTHSW 8 +#define WIDTHSW 3 { "width columns", 0 }, -#define SLEEPSW 9 +#define SLEEPSW 4 { "sleep seconds", 0 }, -#define VERSIONSW 10 +#define VERSIONSW 5 { "version", 0 }, -#define HELPSW 11 +#define HELPSW 6 { "help", 0 }, -#define FORW1SW 12 +#define FORW1SW 7 { "forward", -7 }, -#define FORW2SW 13 +#define FORW2SW 8 { "forwall", -7 }, -#define DGSTSW 14 +#define DGSTSW 9 { "digest list", -6 }, -#define VOLUMSW 15 +#define VOLUMSW 10 { "volume number", -6 }, -#define ISSUESW 16 +#define ISSUESW 11 { "issue number", -5 }, -#define NBODYSW 17 +#define NBODYSW 12 { "nobody", -6 }, { NULL, 0 } }; @@ -86,17 +76,15 @@ 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 { @@ -109,7 +97,6 @@ struct mcomp { 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 +107,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, 0, -1, 80, -1, 0, 0 }; 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, 0 }; struct pair { @@ -162,9 +149,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 +156,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,8 +163,6 @@ static struct triple triples[] = { }; -static int bellflg = 0; -static int clearflg = 0; static int dobody = 1; static int forwflg = 0; static int forwall = 0; @@ -198,14 +178,11 @@ static int mhldebug = 0; #define PITTY (-1) #define NOTTY 0 -#define ISTTY 1 static int ontty = NOTTY; -static int row; static int column; static int lm; -static int llim; static int ovoff; static int term; static int wid; @@ -239,7 +216,7 @@ static FILE *(*mhl_action) () = (FILE *(*) ()) 0; /* ** 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 **); @@ -265,21 +242,17 @@ static void m_popen(char *); void m_pclose(void); -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 sc_hardcopy(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 buf[BUFSIZ], *files[MAXARGS]; char **argp, **arguments; + char *progsw = NULL; #ifdef LOCALE setlocale(LC_ALL, ""); @@ -313,20 +286,6 @@ main(int argc, char **argv) print_version(invo_name); done(1); - case BELLSW: - bellflg = 1; - continue; - case NBELLSW: - bellflg = -1; - continue; - - case CLRSW: - clearflg = 1; - continue; - case NCLRSW: - clearflg = -1; - continue; - case FOLDSW: if (!(folder = *argp++) || *folder == '-') adios(NULL, "missing argument to %s", @@ -346,19 +305,11 @@ main(int argc, char **argv) continue; case PROGSW: - if (!(moreproc = *argp++) || *moreproc == '-') + if (!(progsw = *argp++) || *progsw == '-') 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", @@ -395,7 +346,6 @@ main(int argc, char **argv) forwall++; /* fall */ case FORW1SW: forwflg++; - clearflg = -1;/* XXX */ continue; case NBODYSW: @@ -410,24 +360,18 @@ main(int argc, char **argv) folder = getenv("mhfolder"); if (isatty(fileno(stdout))) { - if (!sc_hardcopy() && moreproc && *moreproc != '\0') { - if (mhl_action) { - SIGNAL(SIGINT, SIG_IGN); - SIGNAL2(SIGQUIT, quitser); - } - SIGNAL2(SIGPIPE, pipeser); - m_popen(moreproc); - ontty = PITTY; - } else { + if (mhl_action) { SIGNAL(SIGINT, SIG_IGN); SIGNAL2(SIGQUIT, quitser); - ontty = ISTTY; } + SIGNAL2(SIGPIPE, pipeser); + m_popen(progsw ? progsw : moreproc); + ontty = PITTY; } 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); @@ -461,9 +405,6 @@ main(int argc, char **argv) adios("output", "error writing"); } - if (clearflg > 0 && ontty == NOTTY) - clear_screen(); - if (ontty == PITTY) m_pclose(); @@ -472,7 +413,7 @@ main(int argc, char **argv) static void -mhl_format(char *file, int length, int width) +mhl_format(char *file, int width) { int i; char *bp, *cp, **ip; @@ -510,9 +451,7 @@ mhl_format(char *file, int length, int width) 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 */ + global.c_flags = 0; *(ip = ignores) = NULL; while (vfgets(fp, &ap) == OK) { @@ -598,34 +537,14 @@ mhl_format(char *file, int length, int width) 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, "\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; } @@ -681,8 +600,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)) { @@ -788,8 +705,8 @@ process(char *folder, char *fname, int ofilen, int ofilec) cp = folder ? concat(folder, ":", fname, NULL) : getcpy(fname); if (ontty != PITTY) SIGNAL(SIGINT, intrser); - mhlfile(fp, cp, ofilen, ofilec); /* FALL THROUGH! */ - + mhlfile(fp, cp, ofilen, ofilec); + /* FALL THROUGH! */ default: if (ontty != PITTY) SIGNAL(SIGINT, SIG_IGN); @@ -827,50 +744,11 @@ mhlfile(FILE *fp, char *mname, int ofilen, int ofilec) printf(" Message %d", ofilen); printf("\n\n"); } - } 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; + } else if (ofilec > 1) { + if (ofilen > 1) { + printf("\n\n\n"); } + printf(">>> %s\n\n", mname); } for (state = FLD;;) { @@ -910,7 +788,7 @@ mhlfile(FILE *fp, char *mname, int ofilen, int ofilec) case BODY: case FILEEOF: - row = column = 0; + column = 0; for (c1 = fmthd; c1; c1 = c1->c_next) { if (c1->c_flags & CLEARTEXT) { putcomp(c1, c1, ONECOMP); @@ -1098,7 +976,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; } @@ -1144,7 +1022,6 @@ 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; @@ -1318,34 +1195,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++; @@ -1355,6 +1205,7 @@ putch(char ch) column--; break; + case '\n': case '\r': column = 0; break;