X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhl.c;h=45113f3ca2f20d7c550c5c51b081795a507ac889;hb=96d10c193324201ef8acb622ed13e9a5ecb59827;hp=fedf78fa9f00a7b9fce00eaf75566dd34f730f98;hpb=921908704b980c90c3c68545be7f4d42718bfba4;p=mmh

diff --git a/uip/mhl.c b/uip/mhl.c
index fedf78f..45113f3 100644
--- 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 == '-')
@@ -576,8 +568,7 @@ process(char *fname, int ofilen, int ofilec)
 	switch (setjmp(env)) {
 	case OK:
 		if (fname) {
-			fp = mhl_action ? (*mhl_action) (fname) :
-					fopen(fname, "r");
+			fp = fopen(fname, "r");
 			if (fp == NULL) {
 				advise(fname, "unable to open");
 				exitstat++;
@@ -592,7 +583,7 @@ process(char *fname, int ofilen, int ofilec)
 		/* FALL THROUGH! */
 	default:
 		SIGNAL(SIGINT, SIG_IGN);
-		if (mhl_action == NULL && fp != stdin)
+		if (fp != stdin)
 			fclose(fp);
 		if (holder.c_text) {
 			free(holder.c_text);
@@ -1120,29 +1111,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);
-}