Merge branch 'master' of ssh://marmaro.de:443/var/git/mmh

[mmh] / uip / mhl.c

diff --git a/uip/mhl.c b/uip/mhl.c
index 8c2e4af..5403673 100644 (file)
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -175,17 +175,11 @@ static int num_ignores = 0;
 static char *ignores[MAXARGS];
 
 static  jmp_buf env;
-static  jmp_buf mhlenv;
-
-static FILE *(*mhl_action) () = (FILE *(*) ()) 0;
-
 
 /*
 ** Redefine a couple of functions.
 ** These are undefined later in the code.
 */
-#define adios mhladios
-#define done  mhldone
 
 /*
 ** prototypes
@@ -208,8 +202,6 @@ static char *oneline(char *, long);
 static void putstr(char *);
 static void putch(char);
 static void intrser(int);
-static void mhladios(char *, char *, ...);
-static void mhldone(int);
 
 int sc_width(void);  /* from termsbr.c */
 
@@ -239,17 +231,17 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               done(1);
+                               exit(1);
                        case UNKWNSW:
                                adios(NULL, "-%s unknown\n", cp);
 
                        case HELPSW:
                                snprintf(buf, sizeof(buf), "%s [switches] [files ...]", invo_name);
                                print_help(buf, switches, 1);
-                               done(1);
+                               exit(0);
                        case VERSIONSW:
                                print_version(invo_name);
-                               done(1);
+                               exit(0);
 
                        case FORMSW:
                                if (!(form = *argp++) || *form == '-')
@@ -575,8 +567,7 @@ process(char *fname, int ofilen, int ofilec)
 
        if (setjmp(env) == 0) {
                if (fname) {
-                       fp = mhl_action ? (*mhl_action) (fname) :
-                                       fopen(fname, "r");
+                       fp = fopen(fname, "r");
                        if (fp == NULL) {
                                advise(fname, "unable to open");
                                exitstat++;
@@ -591,7 +582,7 @@ process(char *fname, int ofilen, int ofilec)
        }
 
        SIGNAL(SIGINT, SIG_IGN);
-       if (mhl_action == NULL && fp != stdin)
+       if (fp != stdin)
                fclose(fp);
        if (holder.c_text) {
                free(holder.c_text);
@@ -1117,29 +1108,3 @@ intrser(int i)
        putchar('\n');
        longjmp(env, DONE);
 }
-
-
-#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);
-}