Use sysexits.h for better exit-codes

[mmh] / uip / refile.c

diff --git a/uip/refile.c b/uip/refile.c
index 17e6d61..01f205b 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define LINKSW  0
@@ -75,17 +76,17 @@ 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\n", cp);
+                               adios(EX_USAGE, NULL, "-%s unknown\n", cp);
 
                        case HELPSW:
                                snprintf(buf, sizeof(buf), "%s [msgs] [switches] +folder ...", 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 LINKSW:
                                linkf++;
@@ -96,18 +97,18 @@ main(int argc, char **argv)
 
                        case SRCSW:
                                if (folder)
-                                       adios(NULL, "only one source folder at a time!");
+                                       adios(EX_USAGE, NULL, "only one source folder at a time!");
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
                                folder = getcpy(expandfol(cp));
                                continue;
                        case FILESW:
                                if (filep > NFOLDERS)
-                                       adios(NULL, "only %d files allowed!",
+                                       adios(EX_USAGE, NULL, "only %d files allowed!",
                                                        NFOLDERS);
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
                                files[filep++] = getcpy(expanddir(cp));
                                continue;
@@ -115,7 +116,7 @@ main(int argc, char **argv)
                }
                if (*cp == '+' || *cp == '@') {
                        if (foldp > NFOLDERS)
-                               adios(NULL, "only %d folders allowed!",
+                               adios(EX_USAGE, NULL, "only %d folders allowed!",
                                                NFOLDERS);
                        folders[foldp++].f_name = getcpy(expandfol(cp));
                } else
@@ -123,19 +124,18 @@ main(int argc, char **argv)
        }
 
        if (foldp == 0)
-               adios(NULL, "no folder specified");
+               adios(EX_USAGE, NULL, "no folder specified");
 
        /*
        ** We are refiling a file to the folders
        */
        if (filep > 0) {
                if (folder || msgs.size)
-                       adios(NULL, "use -file or msgs, not both");
+                       adios(EX_USAGE, NULL, "use -file or msgs, not both");
                opnfolds(folders, foldp);
                for (i = 0; i < filep; i++)
                        if (m_file(files[i], folders, foldp, 0))
-                               /* sysexits.h EX_IOERR */
-                               exit(1);
+                               exit(EX_IOERR);
                /* If -nolink, then unlink files */
                if (!linkf) {
                        int i;
@@ -147,7 +147,7 @@ main(int argc, char **argv)
                                        admonish(files[i], "unable to unlink");
                        }
                }
-               exit(0);
+               exit(EX_OK);
        }
 
        if (!msgs.size)
@@ -157,21 +157,20 @@ main(int argc, char **argv)
        strncpy(maildir, toabsdir(folder), sizeof(maildir));
 
        if (chdir(maildir) == NOTOK)
-               adios(maildir, "unable to change directory to");
+               adios(EX_OSERR, maildir, "unable to change directory to");
 
        /* read source 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 the message range/sequence/name 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_SOFTWARE);
        seq_setprev(mp);  /* set the previous-sequence */
 
        /* create folder structures for each destination folder */
@@ -187,8 +186,7 @@ main(int argc, char **argv)
                if (is_selected(mp, msgnum)) {
                        cp = getcpy(m_name(msgnum));
                        if (m_file(cp, folders, foldp, !linkf))
-                               /* sysexits.h EX_IOERR */
-                               exit(1);
+                               exit(EX_IOERR);
                        free(cp);
                }
        }
@@ -235,9 +233,9 @@ opnfolds(struct st_fold *folders, int nfolders)
                create_folder(nmaildir, 0, exit);
 
                if (chdir(nmaildir) == NOTOK)
-                       adios(nmaildir, "unable to change directory to");
+                       adios(EX_OSERR, nmaildir, "unable to change directory to");
                if (!(mp = folder_read(fp->f_name)))
-                       adios(NULL, "unable to read folder %s", fp->f_name);
+                       adios(EX_IOERR, NULL, "unable to read folder %s", fp->f_name);
                mp->curmsg = 0;
 
                fp->f_mp = mp;