Use sysexits.h for better exit-codes

[mmh] / uip / mark.c

diff --git a/uip/mark.c b/uip/mark.c
index 57a6553..a6ac480 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -12,6 +12,7 @@
 #include <h/utils.h>
 #include <unistd.h>
 #include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define ADDSW  0
@@ -75,18 +76,17 @@ 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\n", cp);
+                               adios(EX_USAGE, NULL, "-%s unknown\n", 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);
 
                        case ADDSW:
                                addsw++;
@@ -102,13 +102,15 @@ main(int argc, char **argv)
                                continue;
 
                        case SEQSW:
-                               if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
+                               if (!(cp = *argp++) || *cp == '-') {
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
+                               }
 
                                /* check if too many sequences specified */
-                               if (seqp >= NUMATTRS)
-                                       adios(NULL, "too many sequences (more than %d) specified", NUMATTRS);
+                               if (seqp >= NUMATTRS) {
+                                       adios(EX_USAGE, NULL, "too many sequences (more than %d) specified", NUMATTRS);
+                               }
                                seqs[seqp++] = cp;
                                continue;
 
@@ -132,12 +134,14 @@ 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
+                       }
+               } else {
                        app_msgarg(&msgs, cp);
+               }
        }
 
        /*
@@ -158,58 +162,62 @@ main(int argc, char **argv)
                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);
+       }
 
        /* print some general debugging info */
        if (debugsw)
                print_debug(mp);
 
        /* 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 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);
                }
        }
 
-       if (publicsw == 1 && is_readonly(mp))
-               adios(NULL, "folder %s is read-only, so -public not allowed",
+       if (publicsw == 1 && is_readonly(mp)) {
+               adios(EX_NOPERM, NULL, "folder %s is read-only, so -public not allowed",
                                folder);
+       }
 
        /*
        ** Make sure at least one sequence has been
        ** specified if we are adding or deleting.
        */
-       if (seqp == 0 && (addsw || deletesw))
-               adios(NULL, "-%s requires at least one -sequence argument",
+       if (seqp == 0 && (addsw || deletesw)) {
+               adios(EX_USAGE, NULL, "-%s requires at least one -sequence argument",
                                addsw ? "add" : "delete");
+       }
        seqs[seqp] = NULL;
 
        /* Adding messages to sequences */
        if (addsw) {
                for (seqp = 0; seqs[seqp]; seqp++) {
                        if (!seq_addsel(mp, seqs[seqp], publicsw, zerosw)) {
-                               /*TODO find best exitcode*/
-                               exit(1);
+                               exit(EX_SOFTWARE);
                        }
                }
        }
 
        /* Deleting messages from sequences */
        if (deletesw) {
-               for (seqp = 0; seqs[seqp]; seqp++)
-                       if (!seq_delsel(mp, seqs[seqp], publicsw, zerosw))
-                               /*TODO find best exitcode*/
-                               exit(1);
+               for (seqp = 0; seqs[seqp]; seqp++) {
+                       if (!seq_delsel(mp, seqs[seqp], publicsw, zerosw)) {
+                               exit(EX_SOFTWARE);
+                       }
+               }
        }
 
        /* Listing messages in sequences */
@@ -232,7 +240,7 @@ main(int argc, char **argv)
        context_replace(curfolder, folder);  /* update current folder */
        context_save();  /* save the context file */
        folder_free(mp);  /* free folder/message structure */
-       return 0;
+       return EX_OK;
 }