Use sysexits.h for better exit-codes

[mmh] / uip / mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 3713495..9ae5bf0 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -18,6 +18,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define VERBSW  0
@@ -102,7 +103,7 @@ main(int argc, char **argv)
        int ontty = 0;
 
        if (atexit(freects_done) != 0) {
-               adios(NULL, "atexit failed");
+               adios(EX_OSERR, NULL, "atexit failed");
        }
 
        setlocale(LC_ALL, "");
@@ -127,51 +128,50 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               /* sysexits.h EX_USAGE */
-                               exit(1);
+                               exit(EX_USAGE);
                        case UNKWNSW:
-                               adios(NULL, "-%s unknown", cp);
+                               adios(EX_USAGE, NULL, "-%s unknown", cp);
 
                        case HELPSW:
                                snprintf(buf, sizeof(buf), "%s [+folder] %s[switches]", invo_name, mode==SHOW ? "[msgs] " : "");
                                print_help(buf, switches, 1);
-                               exit(0);
+                               exit(argc == 2 ? EX_OK : EX_USAGE);
                        case VERSIONSW:
                                print_version(invo_name);
-                               exit(0);
+                               exit(argc == 2 ? EX_OK : EX_USAGE);
 
                        case PARTSW:
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
                                if (npart >= NPARTS)
-                                       adios(NULL, "too many parts (starting with %s), %d max", cp, NPARTS);
+                                       adios(EX_USAGE, NULL, "too many parts (starting with %s), %d max", cp, NPARTS);
                                parts[npart++] = cp;
                                continue;
 
                        case TYPESW:
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
                                if (ntype >= NTYPES)
-                                       adios(NULL, "too many types (starting with %s), %d max", cp, NTYPES);
+                                       adios(EX_USAGE, NULL, "too many types (starting with %s), %d max", cp, NTYPES);
                                types[ntype++] = cp;
                                continue;
 
                        case FILESW:
                                if (mode != SHOW) {
-                                       adios(NULL, "Either call show as `%s' or use -file", invo_name);
+                                       adios(EX_USAGE, NULL, "Either call show as `%s' or use -file", invo_name);
                                }
 
                                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
                                file = *cp == '-' ? cp : getcpy(expanddir(cp));
                                continue;
 
                        case FORMSW:
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
                                if (formsw)
                                        free(formsw);
@@ -191,11 +191,11 @@ main(int argc, char **argv)
                }
                if (*cp == '+' || *cp == '@') {
                        if (folder)
-                               adios(NULL, "only one folder at a time!");
+                               adios(EX_USAGE, NULL, "only one folder at a time!");
                        else
                                folder = getcpy(expandfol(cp));
                } else if (mode != SHOW) {
-                       adios(NULL, "Either call show as `%s' or give message arguments", invo_name);
+                       adios(EX_USAGE, NULL, "Either call show as `%s' or give message arguments", invo_name);
                } else {
                        app_msgarg(&msgs, cp);
                }
@@ -243,14 +243,14 @@ main(int argc, char **argv)
                tmp = getcpy(toabsdir(invo_name));
 
        if (file && msgs.size)
-               adios(NULL, "cannot specify msg and file at same time!");
+               adios(EX_USAGE, NULL, "cannot specify msg and file at same time!");
 
        /*
        ** check if message is coming from file
        */
        if (file) {
                if (!(cts = (CT *) calloc((size_t) 2, sizeof(*cts))))
-                       adios(NULL, "out of memory");
+                       adios(EX_OSERR, NULL, "out of memory");
                ctp = cts;
 
                if ((ct = parse_mime(file)))
@@ -277,21 +277,20 @@ main(int argc, char **argv)
                maildir = toabsdir(folder);
 
                if (chdir(maildir) == NOTOK)
-                       adios(maildir, "unable to change directory to");
+                       adios(EX_OSERR, maildir, "unable to change directory to");
 
                /* read folder and create message structure */
                if (!(mp = folder_read(folder)))
-                       adios(NULL, "unable to read folder %s", folder);
+                       adios(EX_IOERR, NULL, "unable to read folder %s", folder);
 
                /* check for empty folder */
                if (mp->nummsg == 0)
-                       adios(NULL, "no messages in %s", folder);
+                       adios(EX_DATAERR, NULL, "no messages in %s", folder);
 
                /* parse all the message ranges/sequences and set SELECTED */
                for (msgnum = 0; msgnum < msgs.size; msgnum++)
                        if (!m_convert(mp, msgs.msgs[msgnum]))
-                               /* sysexits.h EX_USAGE */
-                               exit(1);
+                               exit(EX_USAGE);
 
                /*
                ** Set the SELECT_UNSEEN bit for all the SELECTED messages,
@@ -307,7 +306,7 @@ main(int argc, char **argv)
 
                if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1),
                                sizeof(*cts))))
-                       adios(NULL, "out of memory");
+                       adios(EX_OSERR, NULL, "out of memory");
                ctp = cts;
 
                /*
@@ -325,7 +324,7 @@ main(int argc, char **argv)
        }
 
        if (!*cts)
-               exit(1);
+               exit(EX_SOFTWARE);
 
        userrs = 1;
        SIGNAL(SIGQUIT, quitser);
@@ -388,7 +387,7 @@ pipeser(int i)
                fflush(stderr);
        }
 
-       exit(1);
+       _exit(EX_IOERR);
        /* NOTREACHED */
 }
 
@@ -403,14 +402,14 @@ m_popen(char *name)
        int pd[2];
 
        if ((sd = dup(fileno(stdout))) == NOTOK)
-               adios("standard output", "unable to dup()");
+               adios(EX_OSERR, "standard output", "unable to dup()");
 
        if (pipe(pd) == NOTOK)
-               adios("pipe", "unable to");
+               adios(EX_OSERR, "pipe", "unable to");
 
        switch (m_pid = fork()) {
        case NOTOK:
-               adios("fork", "unable to");
+               adios(EX_OSERR, "fork", "unable to");
 
        case OK:
                SIGNAL(SIGINT, SIG_DFL);
@@ -424,7 +423,7 @@ m_popen(char *name)
                execlp(name, mhbasename(name), NULL);
                fprintf(stderr, "unable to exec ");
                perror(name);
-               _exit(-1);
+               _exit(EX_OSERR);
 
        default:
                close(pd[0]);
@@ -445,7 +444,7 @@ m_pclose(void)
        if (sd != NOTOK) {
                fflush(stdout);
                if (dup2(sd, fileno(stdout)) == NOTOK)
-                       adios("standard output", "unable to dup2()");
+                       adios(EX_OSERR, "standard output", "unable to dup2()");
 
                clearerr(stdout);
                close(sd);