Use sysexits.h for better exit-codes

[mmh] / uip / ali.c

diff --git a/uip/ali.c b/uip/ali.c
index e7bc90f..c6b028c 100644 (file)
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -11,6 +11,7 @@
 #include <h/aliasbr.h>
 #include <h/utils.h>
 #include <locale.h>
+#include <sysexits.h>
 
 /*
 ** maximum number of names
@@ -73,25 +74,25 @@ 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 [switches] aliases ...",
                                        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 FILESW:
-                               if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s", argp[-2]);
+                               if (!(cp = *argp++) || *cp == '-') {
+                                       adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]);
+                               }
                                if ((i = alias(cp)) != AK_OK)
-                                       adios(NULL, "aliasing error in %s: %s", cp, akerror(i));
+                                       adios(EX_USAGE, NULL, "aliasing error in %s: %s", cp, akerror(i));
                                deffiles = 0;
                                continue;
 
@@ -127,7 +128,7 @@ main(int argc, char **argv)
                for (ap = brkstring(dp=getcpy(cp), " ", "\n");
                                ap && *ap; ap++) {
                        if ((i = alias(etcpath(*ap))) != AK_OK) {
-                               adios(NULL, "aliasing error in %s: %s",
+                               adios(EX_DATAERR, NULL, "aliasing error in %s: %s",
                                                *ap, akerror(i));
                        }
                }
@@ -141,13 +142,13 @@ main(int argc, char **argv)
        */
        if (inverted) {
                if (vecp == 0)
-                       adios(NULL, "usage: %s -user addresses ...  (you forgot the addresses)",
+                       adios(EX_USAGE, NULL, "usage: %s -user addresses ...  (you forgot the addresses)",
                                   invo_name);
 
                for (i = 0; i < vecp; i++)
                        print_usr(vec[i], list, normalize);
 
-               exit(0);
+               exit(EX_OK);
        }
 
        if (vecp) {
@@ -163,7 +164,7 @@ main(int argc, char **argv)
                }
        }
 
-       return 0;
+       return EX_OK;
 }
 
 static void
@@ -214,9 +215,9 @@ print_usr(char *s, int list, int norm)
        register struct mailname *mp, *np;
 
        if ((pp = getname(s)) == NULL)
-               adios(NULL, "no address in \"%s\"", s);
+               adios(EX_DATAERR, NULL, "no address in \"%s\"", s);
        if ((mp = getm(pp, NULL, 0, norm, NULL)) == NULL)
-               adios(NULL, "bad address \"%s\"", s);
+               adios(EX_DATAERR, NULL, "bad address \"%s\"", s);
        while (getname(""))
                continue;