Replace done with exit at uip

[mmh] / uip / mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index c323867..9bc7ed3 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -20,7 +20,7 @@ static struct swit switches[] = {
 #define VERBSW  0
        { "verbose", 0 },
 #define NVERBSW  1
-       { "noverbose", 0 },
+       { "noverbose", 2 },
 #define FILESW  2  /* interface from show */
        { "file file", 0 },
 #define FORMSW  3
@@ -30,7 +30,7 @@ static struct swit switches[] = {
 #define TYPESW  5
        { "type content", 0 },
 #define VERSIONSW  6
-       { "version", 0 },
+       { "Version", 0 },
 #define HELPSW  7
        { "help", 0 },
 #define DEBUGSW  8
@@ -53,6 +53,8 @@ extern char *parts[NPARTS + 1];
 extern char *types[NTYPES + 1];
 extern int userrs;
 
+static enum { SHOW, NEXT, PREV } mode = SHOW;
+
 int debugsw = 0;
 int verbosw = 0;
 
@@ -73,7 +75,7 @@ void show_all_messages(CT *);
 /* mhfree.c */
 void free_content(CT);
 extern CT *cts;
-void freects_done(int) NORETURN;
+void freects_done();
 
 /*
 ** static prototypes
@@ -96,12 +98,15 @@ main(int argc, char **argv)
        FILE *fp;
        int ontty = 0;
 
-       done=freects_done;
+       atexit(freects_done);
 
-#ifdef LOCALE
        setlocale(LC_ALL, "");
-#endif
        invo_name = mhbasename(argv[0]);
+       if (mh_strcasecmp(invo_name, "next")==0) {
+               mode = NEXT;
+       } else if (mh_strcasecmp(invo_name, "prev")==0) {
+               mode = PREV;
+       }
 
        /* read user profile/context */
        context_read();
@@ -117,17 +122,18 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               done(1);
+                               /* sysexits.h EX_USAGE */
+                               exit(1);
                        case UNKWNSW:
                                adios(NULL, "-%s unknown", cp);
 
                        case HELPSW:
-                               snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
+                               snprintf(buf, sizeof(buf), "%s [+folder] %s[switches]", invo_name, mode==SHOW ? "[msgs] " : "");
                                print_help(buf, switches, 1);
-                               done(1);
+                               exit(0);
                        case VERSIONSW:
                                print_version(invo_name);
-                               done(1);
+                               exit(0);
 
                        case PARTSW:
                                if (!(cp = *argp++) || *cp == '-')
@@ -148,6 +154,10 @@ main(int argc, char **argv)
                                continue;
 
                        case FILESW:
+                               if (mode != SHOW) {
+                                       adios(NULL, "Either call show as `%s' or use -file", invo_name);
+                               }
+
                                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);
@@ -179,8 +189,11 @@ main(int argc, char **argv)
                                adios(NULL, "only one folder at a time!");
                        else
                                folder = getcpy(expandfol(cp));
-               } else
+               } else if (mode != SHOW) {
+                       adios(NULL, "Either call show as `%s' or give message arguments", invo_name);
+               } else {
                        app_msgarg(&msgs, cp);
+               }
        }
 
        /* null terminate the list of acceptable parts/types */
@@ -241,8 +254,19 @@ main(int argc, char **argv)
                /*
                ** message(s) are coming from a folder
                */
-               if (!msgs.size)
-                       app_msgarg(&msgs, seq_cur);
+               if (!msgs.size) {
+                       switch (mode) {
+                       case NEXT:
+                               app_msgarg(&msgs, seq_next);
+                               break;
+                       case PREV:
+                               app_msgarg(&msgs, seq_prev);
+                               break;
+                       default:
+                               app_msgarg(&msgs, seq_cur);
+                               break;
+                       }
+               }
                if (!folder)
                        folder = getcurfol();
                maildir = toabsdir(folder);
@@ -261,7 +285,8 @@ main(int argc, char **argv)
                /* parse all the message ranges/sequences and set SELECTED */
                for (msgnum = 0; msgnum < msgs.size; msgnum++)
                        if (!m_convert(mp, msgs.msgs[msgnum]))
-                               done(1);
+                               /* sysexits.h EX_USAGE */
+                               exit(1);
 
                /*
                ** Set the SELECT_UNSEEN bit for all the SELECTED messages,
@@ -295,7 +320,7 @@ main(int argc, char **argv)
        }
 
        if (!*cts)
-               done(1);
+               exit(1);
 
        userrs = 1;
        SIGNAL(SIGQUIT, quitser);
@@ -344,8 +369,7 @@ main(int argc, char **argv)
                context_save();                    /* save the context file */
        }
 
-       done(0);
-       return 1;
+       return 0;
 }
 
 
@@ -359,7 +383,7 @@ pipeser(int i)
                fflush(stderr);
        }
 
-       done(1);
+       exit(1);
        /* NOTREACHED */
 }