Use sysexits.h for better exit-codes

[mmh] / uip / pick.c

diff --git a/uip/pick.c b/uip/pick.c
index 07dca9a..a487adc 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -11,6 +11,7 @@
 #include <h/utils.h>
 #include <unistd.h>
 #include <locale.h>
+#include <sysexits.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
@@ -94,7 +95,7 @@ main(int argc, char **argv)
        register FILE *fp;
 
         if (atexit(putzero_done) != 0) {
-               adios(NULL, "atexit failed");
+               adios(EX_OSERR, NULL, "atexit failed");
        }
 
        setlocale(LC_ALL, "");
@@ -116,19 +117,19 @@ main(int argc, char **argv)
                        case AMBIGSW:
                                ambigsw(cp, switches);
                                listsw = 0;  /* HACK */
-                               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);
                                listsw = 0;  /* HACK */
-                               exit(0);
+                               exit(argc == 2 ? EX_OK : EX_USAGE);
                        case VERSIONSW:
                                print_version(invo_name);
                                listsw = 0;  /* HACK */
-                               exit(0);
+                               exit(argc == 2 ? EX_OK : EX_USAGE);
 
                        case CCSW:
                        case DATESW:
@@ -142,12 +143,12 @@ main(int argc, char **argv)
                                vec[vecp++] = --cp;
                        pattern:
                                if (!(cp = *argp++)) /* allow -xyz arguments */
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
                                vec[vecp++] = cp;
                                continue;
                        case OTHRSW:
-                               adios(NULL, "internal error!");
+                               adios(EX_SOFTWARE, NULL, "internal error!");
 
                        case ANDSW:
                        case ORSW:
@@ -159,15 +160,15 @@ main(int argc, char **argv)
 
                        case SEQSW:
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
+                                       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);
+                                       adios(EX_USAGE, NULL, "too many sequences (more than %d) specified", NUMATTRS);
 
                                if (!seq_nameok(cp))
-                                       exit(1);
+                                       exit(EX_USAGE);
 
                                seqs[seqp++] = cp;
                                continue;
@@ -194,7 +195,7 @@ 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
@@ -214,20 +215,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 */
 
        /*
@@ -238,11 +239,11 @@ main(int argc, char **argv)
                listsw = !seqp;
 
        if (publicsw == 1 && is_readonly(mp))
-               adios(NULL, "folder %s is read-only, so -public not allowed",
+               adios(EX_NOPERM, NULL, "folder %s is read-only, so -public not allowed",
                                folder);
 
        if (!pcompile(vec, NULL))
-               exit(1);
+               exit(EX_SOFTWARE);
 
        lo = mp->lowsel;
        hi = mp->hghsel;
@@ -284,7 +285,7 @@ main(int argc, char **argv)
        mp->hghsel = hi;
 
        if (mp->numsel <= 0)
-               adios(NULL, "no messages match specification");
+               adios(EX_DATAERR, NULL, "no messages match specification");
 
        seqs[seqp] = NULL;
 
@@ -293,7 +294,7 @@ main(int argc, char **argv)
        */
        for (seqp = 0; seqs[seqp]; seqp++)
                if (!seq_addsel(mp, seqs[seqp], publicsw, zerosw))
-                       exit(1);
+                       exit(EX_USAGE);
 
        /*
        ** Print total matched if not printing each matched message number.
@@ -768,7 +769,7 @@ newnexus(int (*action)())
        register struct nexus *p;
 
        if ((p = (struct nexus *) calloc((size_t) 1, sizeof *p)) == NULL)
-               adios(NULL, "unable to allocate component storage");
+               adios(EX_OSERR, NULL, "unable to allocate component storage");
 
        p->n_action = action;
        return p;
@@ -1270,7 +1271,7 @@ plist
                        return 0;
 
                default:
-                       adios(NULL, "internal error -- you lose");
+                       adios(EX_SOFTWARE, NULL, "internal error -- you lose");
                }
                break;
        }