Use sysexits.h for better exit-codes

[mmh] / uip / comp.c

diff --git a/uip/comp.c b/uip/comp.c
index 62e4cd2..159d7e7 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -11,6 +11,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define EDITRSW  0
@@ -57,32 +58,34 @@ 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] [msg] [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);
 
                        case EDITRSW:
-                               if (!(ed = *argp++) || *ed == '-')
-                                       adios(NULL, "missing argument to %s", argp[-2]);
+                               if (!(ed = *argp++) || *ed == '-') {
+                                       adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]);
+                               }
                                continue;
 
                        case WHATSW:
-                               if (!(whatnowproc = *argp++) || *whatnowproc == '-')
-                                       adios(NULL, "missing argument to %s", argp[-2]);
+                               if (!(whatnowproc = *argp++) || *whatnowproc == '-') {
+                                       adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]);
+                               }
                                continue;
 
                        case FORMSW:
-                               if (!(form = *argp++) || *form == '-')
-                                       adios(NULL, "missing argument to %s", argp[-2]);
+                               if (!(form = *argp++) || *form == '-') {
+                                       adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]);
+                               }
                                continue;
 
                        case USESW:
@@ -94,25 +97,29 @@ main(int argc, char **argv)
                        }
                }
                if (*cp == '+' || *cp == '@') {
-                       if (folder)
-                               adios(NULL, "only one folder at a time!");
-                       else
+                       if (folder) {
+                               adios(EX_USAGE, NULL, "only one folder at a time!");
+                       } else {
                                folder = getcpy(expandfol(cp));
+                       }
                } else {
-                       if (msg)
-                               adios(NULL, "only one message at a time!");
-                       else
+                       if (msg) {
+                               adios(EX_USAGE, NULL, "only one message at a time!");
+                       } else {
                                msg = cp;
+                       }
                }
        }
 
        cwd = getcpy(pwd());
 
-       if (form && (folder || msg))
-               adios(NULL, "can't mix forms and folders/msgs");
+       if (form && (folder || msg)) {
+               adios(EX_USAGE, NULL, "can't mix forms and folders/msgs");
+       }
 
-       if (use && folder)
-               adios(NULL, "can't mix -use and +folder");
+       if (use && folder) {
+               adios(EX_USAGE, NULL, "can't mix -use and +folder");
+       }
 
        if (use) {
                /* Don't copy; the draft shall get removed in the end. */
@@ -125,28 +132,33 @@ main(int argc, char **argv)
                if (!folder)
                        folder = getcurfol();
                maildir = toabsdir(folder);
-               if (chdir(maildir) == NOTOK)
-                       adios(maildir, "unable to change directory to");
+               if (chdir(maildir) == NOTOK) {
+                       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);
+               if (!(mp = folder_read(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);
+               if (mp->nummsg == 0) {
+                       adios(EX_DATAERR, NULL, "no messages in %s", folder);
+               }
                /* parse the message range/sequence/name and set SELECTED */
-               if (!m_convert(mp, msg))
-                       /* sysexits.h EX_USAGE */
-                       exit(1);
+               if (!m_convert(mp, msg)) {
+                       exit(EX_SOFTWARE);
+               }
                seq_setprev(mp);  /* set the previous-sequence */
-               if (mp->numsel > 1)
-                       adios(NULL, "only one message at a time!");
+               if (mp->numsel > 1) {
+                       adios(EX_USAGE, NULL, "only one message at a time!");
+               }
                if ((in = open(form = getcpy(m_name(mp->lowsel)),
-                               O_RDONLY)) == NOTOK)
-                       adios(form, "unable to open message");
+                               O_RDONLY)) == NOTOK) {
+                       adios(EX_IOERR, form, "unable to open message");
+               }
 
                strncpy(drft, m_draft(seq_beyond), sizeof(drft));
                if ((out = creat(drft, m_gmprot())) == NOTOK) {
-                       adios(drft, "unable to create");
+                       adios(EX_CANTCREAT, drft, "unable to create");
                }
                cpydata(in, out, form, drft);
                close(in);
@@ -156,16 +168,15 @@ main(int argc, char **argv)
                fmtstr = new_fs(form, components);
                strncpy(drft, m_draft(seq_beyond), sizeof(drft));
                if ((out = creat(drft, m_gmprot())) == NOTOK) {
-                       adios(drft, "unable to create");
+               adios(EX_CANTCREAT, drft, "unable to create");
                }
                if (write(out, fmtstr, strlen(fmtstr)) != (int)strlen(fmtstr)) {
-                       adios(drft, "error writing");
+                       adios(EX_IOERR, drft, "error writing");
                }
                close(out);
        }
 
        context_save();
        what_now(ed, use, drft, NULL, 0, NULLMP, NULL, cwd);
-       /* sysexits.h EX_SOFTWARE */
-       return 1;
+       return EX_OSERR;
 }