X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhl.c;h=328db8fc8d28ba6245b36322f459a7fad1e721e5;hp=c1c53551fde34066d054386907254f152cb4f977;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=1577ee015a08dd21f0f57f8a8f9a9396c31e884d diff --git a/uip/mhl.c b/uip/mhl.c index c1c5355..328db8f 100644 --- a/uip/mhl.c +++ b/uip/mhl.c @@ -41,29 +41,27 @@ #define QUOTE '\\' static struct swit mhlswitches[] = { -#define FOLDSW 0 - { "folder +folder", 0 }, -#define FORMSW 1 +#define FORMSW 0 { "form formfile", 0 }, -#define WIDTHSW 2 +#define WIDTHSW 1 { "width columns", 0 }, -#define SLEEPSW 3 +#define SLEEPSW 2 { "sleep seconds", 0 }, -#define VERSIONSW 4 - { "version", 0 }, -#define HELPSW 5 +#define VERSIONSW 3 + { "Version", 0 }, +#define HELPSW 4 { "help", 0 }, -#define FORW1SW 6 +#define FORW1SW 5 { "forward", -7 }, -#define FORW2SW 7 +#define FORW2SW 6 { "forwall", -7 }, -#define DGSTSW 8 +#define DGSTSW 7 { "digest list", -6 }, -#define VOLUMSW 9 +#define VOLUMSW 8 { "volume number", -6 }, -#define ISSUESW 10 +#define ISSUESW 9 { "issue number", -5 }, -#define NBODYSW 11 +#define NBODYSW 10 { "nobody", -6 }, { NULL, 0 } }; @@ -105,11 +103,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 { @@ -174,16 +172,12 @@ 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; @@ -219,7 +213,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 +225,9 @@ 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 intrser(int); static void mhladios(char *, char *, ...); static void mhldone(int); -static void m_popen(char *); - -void m_pclose(void); int sc_width(void); /* from termsbr.c */ @@ -247,7 +236,7 @@ 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; @@ -283,11 +272,6 @@ main(int argc, char **argv) print_version(invo_name); done(1); - 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", @@ -347,28 +331,13 @@ 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) { @@ -396,9 +365,6 @@ main(int argc, char **argv) adios("output", "error writing"); } - if (ontty == PITTY) - m_pclose(); - return exitstat; } @@ -668,9 +634,8 @@ 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; @@ -688,17 +653,13 @@ process(char *folder, char *fname, int ofilen, int ofilec) fname = "(stdin)"; fp = stdin; } - cp = folder ? concat(folder, ":", fname, NULL) : getcpy(fname); - if (ontty != PITTY) - SIGNAL(SIGINT, intrser); - mhlfile(fp, cp, ofilen, ofilec); + SIGNAL(SIGINT, intrser); + mhlfile(fp, fname, ofilen, ofilec); /* FALL THROUGH! */ default: - if (ontty != PITTY) - SIGNAL(SIGINT, SIG_IGN); + 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; @@ -1082,11 +1043,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; @@ -1223,43 +1184,15 @@ putch(char ch) } -static RETSIGTYPE +static void 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 @@ -1284,68 +1217,3 @@ mhldone(int status) 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) -{ - 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; -}