X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhl.c;h=e778fc312db8b295cdb84047a25c31c474ebe00b;hb=943765e7ac5693ae177fd8d2b5a2440e53ce816e;hp=b1410ad1a4fad201d2e4f1c508cc70ad67d19138;hpb=b7764c4a6b71d37918a97594d866258f154017ca;p=mmh diff --git a/uip/mhl.c b/uip/mhl.c index b1410ad..e778fc3 100644 --- a/uip/mhl.c +++ b/uip/mhl.c @@ -41,41 +41,33 @@ #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 +#define LENSW 3 { "length lines", 0 }, -#define WIDTHSW 8 +#define WIDTHSW 4 { "width columns", 0 }, -#define SLEEPSW 9 +#define SLEEPSW 5 { "sleep seconds", 0 }, -#define VERSIONSW 10 +#define VERSIONSW 6 { "version", 0 }, -#define HELPSW 11 +#define HELPSW 7 { "help", 0 }, -#define FORW1SW 12 +#define FORW1SW 8 { "forward", -7 }, -#define FORW2SW 13 +#define FORW2SW 9 { "forwall", -7 }, -#define DGSTSW 14 +#define DGSTSW 10 { "digest list", -6 }, -#define VOLUMSW 15 +#define VOLUMSW 11 { "volume number", -6 }, -#define ISSUESW 16 +#define ISSUESW 12 { "issue number", -5 }, -#define NBODYSW 17 +#define NBODYSW 13 { "nobody", -6 }, { NULL, 0 } }; @@ -86,17 +78,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 { @@ -120,7 +110,7 @@ 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, 40, 0, 0 }; static struct mcomp holder = { @@ -162,9 +152,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 +159,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 +166,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,7 +181,6 @@ static int mhldebug = 0; #define PITTY (-1) #define NOTTY 0 -#define ISTTY 1 static int ontty = NOTTY; static int row; @@ -265,7 +247,6 @@ 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 */ @@ -279,6 +260,7 @@ main(int argc, char **argv) char *cp, *folder = NULL, *form = NULL; char buf[BUFSIZ], *files[MAXARGS]; char **argp, **arguments; + char *progsw = NULL; #ifdef LOCALE setlocale(LC_ALL, ""); @@ -312,20 +294,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", @@ -345,7 +313,7 @@ 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; @@ -394,7 +362,6 @@ main(int argc, char **argv) forwall++; /* fall */ case FORW1SW: forwflg++; - clearflg = -1;/* XXX */ continue; case NBODYSW: @@ -409,19 +376,13 @@ main(int argc, char **argv) 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 { + 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; } @@ -460,9 +421,6 @@ main(int argc, char **argv) adios("output", "error writing"); } - if (clearflg > 0 && ontty == NOTTY) - clear_screen(); - if (ontty == PITTY) m_pclose(); @@ -511,7 +469,7 @@ mhl_format(char *file, int length, int width) 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) { @@ -603,22 +561,6 @@ mhl_format(char *file, int length, int width) } 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) @@ -787,8 +729,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); @@ -826,50 +768,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;;) { @@ -1328,16 +1231,12 @@ putch(char ch) llim--; column = 0; row++; - if (ontty != ISTTY || row != global.c_length) + if (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');