Replace done with exit at uip

[mmh] / uip / flist.c

diff --git a/uip/flist.c b/uip/flist.c
index ac68080..c0c8b5f 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -30,23 +30,23 @@ static struct swit switches[] = {
 #define ALLSW  1
        { "all", 0 },
 #define NOALLSW  2
-       { "noall", 0 },
+       { "noall", 2 },
 #define RECURSE  3
        { "recurse", 0 },
 #define NORECURSE  4
-       { "norecurse", 0 },
+       { "norecurse", 2 },
 #define SHOWZERO  5
        { "showzero", 0 },
 #define NOSHOWZERO  6
-       { "noshowzero", 0 },
+       { "noshowzero", 2 },
 #define ALPHASW  7
        { "alpha", 0 },
 #define NOALPHASW  8
-       { "noalpha", 0 },
+       { "noalpha", 2 },
 #define FASTSW  9
        { "fast", 0 },
 #define NOFASTSW  10
-       { "nofast", 0 },
+       { "nofast", 2 },
 #define VERSIONSW  11
        { "Version", 0 },
 #define HELPSW  12
@@ -118,9 +118,7 @@ main(int argc, char **argv)
        char **arguments;
        char buf[BUFSIZ];
 
-#ifdef LOCALE
        setlocale(LC_ALL, "");
-#endif
        invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
@@ -151,17 +149,18 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               done(1);
+                               /* sysexits.h EX_USAGE */
+                               exit(1);
                        case UNKWNSW:
                                adios(NULL, "-%s unknown", cp);
 
                        case HELPSW:
                                snprintf(buf, sizeof(buf), "%s [+folder1 [+folder2 ...]][switches]", invo_name);
                                print_help(buf, switches, 1);
-                               done(1);
+                               exit(0);
                        case VERSIONSW:
                                print_version(invo_name);
-                               done(1);
+                               exit(0);
 
                        case SEQSW:
                                if (!(cp = *argp++) || *cp == '-')
@@ -262,8 +261,7 @@ main(int argc, char **argv)
        qsort(folders, nFolders, sizeof(struct Folder),
                        (qsort_comp) CompareFolders);
        PrintFolders();
-       done(0);
-       return 1;
+       return 0;
 }
 
 /*