Move #include from h/mh.h to source files

[mmh] / uip / mhl.c

diff --git a/uip/mhl.c b/uip/mhl.c
index 8c2094e..386cf95 100644 (file)
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -12,8 +12,10 @@
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 #include <h/utils.h>
-#include <setjmp.h>
 #include <signal.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 /*
 ** MAJOR BUG:
@@ -40,22 +42,20 @@
 
 #define QUOTE  '\\'
 
-static struct swit mhlswitches[] = {
+static struct swit switches[] = {
 #define FORMSW  0
        { "form formfile", 0 },
 #define WIDTHSW  1
        { "width columns", 0 },
-#define SLEEPSW  2
-       { "sleep seconds",  0 },
-#define VERSIONSW  3
+#define VERSIONSW  2
        { "Version", 0 },
-#define HELPSW  4
+#define HELPSW  3
        { "help", 0 },
-#define FORW1SW  5
+#define FORW1SW  4
        { "forward", -7 },
-#define FORW2SW  6
+#define FORW2SW  5
        { "forwall", -7 },
-#define NBODYSW  8
+#define NBODYSW  6
        { "nobody", -6 },
        { NULL, 0 }
 };
@@ -157,8 +157,6 @@ static int dobody    = 1;
 static int forwflg   = 0;
 static int forwall   = 0;
 
-static int sleepsw = NOTOK;
-
 static int exitstat = 0;
 static int mhldebug = 0;
 
@@ -178,18 +176,12 @@ static char *parptr;
 static int num_ignores = 0;
 static char *ignores[MAXARGS];
 
-static  jmp_buf env;
-static  jmp_buf mhlenv;
-
-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
@@ -212,8 +204,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 */
 
@@ -226,10 +216,7 @@ main(int argc, char **argv)
        char buf[BUFSIZ], *files[MAXARGS];
        char **argp, **arguments;
 
-#ifdef LOCALE
        setlocale(LC_ALL, "");
-#endif
-
        invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
@@ -243,20 +230,20 @@ 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(1);
                        case UNKWNSW:
                                adios(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(0);
                        case VERSIONSW:
                                print_version(invo_name);
-                               done(1);
+                               exit(0);
 
                        case FORMSW:
                                if (!(form = *argp++) || *form == '-')
@@ -264,13 +251,6 @@ main(int argc, char **argv)
                                                        argp[-2]);
                                continue;
 
-                       case SLEEPSW:
-                               if (!(cp = *argp++) || *cp == '-')
-                                       adios(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",
@@ -587,36 +567,30 @@ process(char *fname, int ofilen, int ofilec)
        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;
-               }
-               SIGNAL(SIGINT, intrser);
-               mhlfile(fp, fname, ofilen, ofilec);
-               /* FALL THROUGH! */
-       default:
-               SIGNAL(SIGINT, SIG_IGN);
-               if (mhl_action == NULL && fp != stdin)
-                       fclose(fp);
-               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;
 }
 
 
@@ -641,7 +615,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:
@@ -1130,33 +1104,5 @@ putch(char ch)
 static void
 intrser(int i)
 {
-       discard(stdout);
-       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);
+       eflag = 1;
 }