Merge ../mmh

[mmh] / uip / rmm.c

diff --git a/uip/rmm.c b/uip/rmm.c
index 33ae9da..03d4568 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -46,17 +46,17 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               done(1);
+                               exit(1);
                        case UNKWNSW:
                                adios(NULL, "-%s unknown\n", cp);
 
                        case HELPSW:
                                snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
                                print_help(buf, switches, 1);
-                               done(1);
+                               exit(0);
                        case VERSIONSW:
                                print_version(invo_name);
-                               done(1);
+                               exit(0);
 
                        case UNLINKSW:
                                unlink_msgs++;
@@ -103,7 +103,8 @@ main(int argc, char **argv)
        */
        for (msgnum = 0; msgnum < msgs.size; msgnum++) {
                if (!m_convert(mp, msgs.msgs[msgnum])) {
-                       done(1);
+                       /* sysexits EX_USAGE */
+                       exit(1);
                }
        }
 
@@ -116,8 +117,7 @@ main(int argc, char **argv)
                seq_setprev(mp);
                seq_save(mp);
                folder_free(mp);
-               done(0);
-               return 1;
+               return 0;
        }
 
        /* remove by refiling. */
@@ -139,7 +139,6 @@ main(int argc, char **argv)
                vec[vecp++] = msgs.msgs[msgnum];
        }
        vec[vecp] = NULL;
-       done(execprog(*vec, vec));
 
-       return 1;  /* just in case ... */
+       return execprog(*vec, vec);
 }