Use sysexits.h for better exit-codes

[mmh] / uip / packf.c

diff --git a/uip/packf.c b/uip/packf.c
index 78f64c0..c81db88 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define VERSIONSW  0
@@ -49,22 +50,22 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               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] [msgs] [switches]", invo_name);
                                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);
                        }
                }
                if (*cp == '+' || *cp == '@') {
                        if (folder)
-                               adios(NULL, "only one folder at a time!");
+                               adios(EX_USAGE, NULL, "only one folder at a time!");
                        folder = getcpy(expandfol(cp));
                } else
                        app_msgarg(&msgs, cp);
@@ -79,20 +80,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]))
-                       exit(1);
+                       exit(EX_USAGE);
        seq_setprev(mp);  /* set the previous-sequence */
 
        /* copy all the SELECTED messages to stdout */
@@ -104,7 +105,7 @@ main(int argc, char **argv)
                                break;
                        }
                        if (mbox_copy(fileno(stdout), fd) == NOTOK) {
-                               adios(NULL, "error writing to stdout");
+                               adios(EX_IOERR, NULL, "error writing to stdout");
                        }
                        close(fd);
                }