Replace done with exit at uip

[mmh] / uip / mhpath.c

diff --git a/uip/mhpath.c b/uip/mhpath.c
index a8de5cb..67408ed 100644 (file)
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -44,17 +44,17 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               done(1);
+                               exit(1); //sysexits.h EX_TEMPFAIL
                        case UNKWNSW:
                                adios(NULL, "-%s unknown", cp);
 
                        case HELPSW:
                                snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
                                print_help(buf, switches, 1);
-                               done(1);
+                               exit(0); //sysexits.h EX_OK
                        case VERSIONSW:
                                print_version(invo_name);
-                               done(1);
+                               exit(0); //sysexits.h EX_OK
                        }
                }
                if (*cp == '+' || *cp == '@') {
@@ -73,7 +73,7 @@ main(int argc, char **argv)
        /* If no messages are given, print folder pathname */
        if (!msgs.size) {
                printf("%s\n", maildir);
-               done(0);
+               exit(0); //sysexits.h EX_OK
        }
 
        if (chdir(maildir) == NOTOK)
@@ -108,9 +108,11 @@ main(int argc, char **argv)
        mp->msgflags |= ALLOW_BEYOND;  /* allow the beyond sequence */
 
        /* parse all the message ranges/sequences and set SELECTED */
-       for (i = 0; i < msgs.size; i++)
-               if (!m_convert(mp, msgs.msgs[i]))
-                       done(1);
+       for (i = 0; i < msgs.size; i++) {
+               if (!m_convert(mp, msgs.msgs[i])) {
+                       exit(1); //sysexits.h EX_USAGE
+               }
+       }
 
        seq_setprev(mp);  /* set the previous-sequence */
 
@@ -122,6 +124,5 @@ main(int argc, char **argv)
        seq_save(mp);  /* synchronize message sequences */
        context_save();  /* save the context file */
        folder_free(mp);  /* free folder/message structure */
-       done(0);
-       return 1;
+       return 0;
 }