Use sysexits.h for better exit-codes

[mmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index 615369c..f246004 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -10,6 +10,7 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <locale.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <locale.h>

+#include <sysexits.h>

 
 static struct swit switches[] = {
 #define INTRSW  0
 
 static struct swit switches[] = {
 #define INTRSW  0

@@ -51,17 +52,17 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);

-                               exit(1);
+                               exit(EX_USAGE);

                        case UNKWNSW:
                        case UNKWNSW:

-                               adios(NULL, "-%s unknown", cp);
+                               adios(EX_USAGE, NULL, "-%s unknown", cp);

 
                        case HELPSW:
                                snprintf(buf, sizeof(buf), "%s [+folder] [switches]", invo_name);
                                print_help(buf, switches, 1);
 
                        case HELPSW:
                                snprintf(buf, sizeof(buf), "%s [+folder] [switches]", invo_name);
                                print_help(buf, switches, 1);

-                               exit(0);
+                               exit(argc == 2 ? EX_OK : EX_USAGE);

                        case VERSIONSW:
                                print_version(invo_name);
                        case VERSIONSW:
                                print_version(invo_name);

-                               exit(0);
+                               exit(argc == 2 ? EX_OK : EX_USAGE);

 
                        case INTRSW:
                                interactive = 1;
 
                        case INTRSW:
                                interactive = 1;

@@ -73,11 +74,11 @@ main(int argc, char **argv)
                }
                if (*cp == '+' || *cp == '@') {
                        if (folder)
                }
                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 {
                        else
                                folder = getcpy(expandfol(cp));
                } else {

-                       adios(NULL, "usage: %s [+folder] [switches]",
+                       adios(EX_USAGE, NULL, "usage: %s [+folder] [switches]",

                                        invo_name);
                }
        }
                                        invo_name);
                }
        }

@@ -87,7 +88,7 @@ main(int argc, char **argv)
                defolder++;
        }
        if (strcmp(toabsdir(folder), pwd()) == 0)
                defolder++;
        }
        if (strcmp(toabsdir(folder), pwd()) == 0)

-               adios(NULL, "You can't remove the current working directory");
+               adios(EX_USAGE, NULL, "You can't remove the current working directory");

 
        if (interactive == -1)
                interactive = defolder;
 
        if (interactive == -1)
                interactive = defolder;

@@ -108,7 +109,7 @@ main(int argc, char **argv)
        if (interactive) {
                cp = concat("Remove folder \"", folder, "\"? ", NULL);
                if (!getanswer(cp))
        if (interactive) {
                cp = concat("Remove folder \"", folder, "\"? ", NULL);
                if (!getanswer(cp))

-                       exit(0);
+                       exit(EX_OK);

                free(cp);
        }
 
                free(cp);
        }
 

@@ -152,7 +153,7 @@ rmf(char *folder)
        }
 
        if ((dd = opendir(".")) == NULL)
        }
 
        if ((dd = opendir(".")) == NULL)

-               adios(NULL, "unable to read folder +%s", folder);
+               adios(EX_IOERR, NULL, "unable to read folder +%s", folder);

        others = 0;
 
        /*
        others = 0;
 
        /*