X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhl.c;h=6989c70597aca954529be3ae43fe6cf1d2850060;hp=38926b6d3019791dac72a4ac11c9af40e495e2bf;hb=7a13a5266a14f1c6a13752db9292cd40c1211fba;hpb=0c4214ea2aec6497d0d67b436bbee9bc1d225f1e diff --git a/uip/mhl.c b/uip/mhl.c index 38926b6..6989c70 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,30 +43,20 @@ #define QUOTE '\\' -static struct swit mhlswitches[] = { -#define FOLDSW 0 - { "folder +folder", 0 }, -#define FORMSW 1 +static struct swit switches[] = { +#define FORMSW 0 { "form formfile", 0 }, -#define WIDTHSW 2 +#define WIDTHSW 1 { "width columns", 0 }, -#define SLEEPSW 3 - { "sleep seconds", 0 }, -#define VERSIONSW 4 - { "version", 0 }, -#define HELPSW 5 +#define VERSIONSW 2 + { "Version", 0 }, +#define HELPSW 3 { "help", 0 }, -#define FORW1SW 6 +#define FORW1SW 4 { "forward", -7 }, -#define FORW2SW 7 +#define FORW2SW 5 { "forwall", -7 }, -#define DGSTSW 8 - { "digest list", -6 }, -#define VOLUMSW 9 - { "volume number", -6 }, -#define ISSUESW 10 - { "issue number", -5 }, -#define NBODYSW 11 +#define NBODYSW 6 { "nobody", -6 }, { NULL, 0 } }; @@ -105,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, 0, 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, NOCOMPONENT, 0 + NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NOCOMPONENT, NULL }; struct pair { @@ -165,25 +158,15 @@ 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 -static int ontty = NOTTY; - -static int column; +static unsigned int column; static int lm; static int ovoff; static int term; -static int wid; +static unsigned int wid; static char *ovtxt; @@ -194,22 +177,12 @@ 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 @@ -219,7 +192,7 @@ 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 *); @@ -231,14 +204,7 @@ 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); int sc_width(void); /* from termsbr.c */ @@ -247,14 +213,11 @@ int main(int argc, char **argv) { 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 */ @@ -268,68 +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); + exit(argc == 2 ? EX_OK : EX_USAGE); - 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 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; @@ -347,58 +275,25 @@ main(int argc, char **argv) files[vecp++] = cp; } - if (!folder) - folder = getenv("mhfolder"); - - if (isatty(fileno(stdout))) { - if (mhl_action) { - SIGNAL(SIGINT, SIG_IGN); - SIGNAL2(SIGQUIT, quitser); - } - SIGNAL2(SIGPIPE, pipeser); - m_popen(defaultpager); - ontty = PITTY; - } else { - ontty = NOTTY; - } - 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 (ontty == PITTY) - m_pclose(); - return exitstat; } @@ -407,7 +302,7 @@ static void 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; @@ -427,7 +322,7 @@ mhl_format(char *file, 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; @@ -443,7 +338,7 @@ mhl_format(char *file, int width) global.c_width = i; global.c_cwidth = -1; global.c_flags = 0; - *(ip = ignores) = NULL; + *ignores = NULL; while (vfgets(fp, &ap) == OK) { bp = ap; @@ -470,31 +365,26 @@ mhl_format(char *file, 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_fstr && global.c_fstr) { if ((c1->c_flags & DATEFMT) && @@ -519,7 +409,7 @@ mhl_format(char *file, int width) continue; default: - adios(NULL, "format file syntax error: %s", bp); + adios(EX_CONFIG, NULL, "format file syntax error: %s", bp); } } fclose(fp); @@ -673,46 +563,35 @@ 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; } @@ -724,17 +603,12 @@ mhlfile(FILE *fp, char *mname, int ofilen, int ofilec) char **ip, name[NAMESZ], buf[BUFSIZ]; 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); + printf("\n\n"); } else if (ofilec > 1) { if (ofilen > 1) { printf("\n\n\n"); @@ -742,7 +616,7 @@ mhlfile(FILE *fp, char *mname, int ofilen, int ofilec) printf(">>> %s\n\n", mname); } - for (state = FLD;;) { + for (state = FLD;!eflag;) { switch (state = m_getfld(state, name, buf, sizeof(buf), fp)) { case FLD: case FLDPLUS: @@ -827,7 +701,7 @@ mhlfile(FILE *fp, char *mname, int ofilen, int ofilec) return; default: - adios(NULL, "getfld() returned %d", state); + adios(EX_SOFTWARE, NULL, "getfld() returned %d", state); } } } @@ -906,9 +780,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); @@ -955,8 +827,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)) @@ -1019,7 +890,7 @@ putcomp(struct mcomp *c1, struct mcomp *c2, int flag) 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) { @@ -1087,11 +958,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; @@ -1228,129 +1099,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; }