Merge branch 'master' of ssh://marmaro.de:443/var/git/mmh

[mmh] / uip / mhmail.c

diff --git a/uip/mhmail.c b/uip/mhmail.c
index e79d874..9936261 100644 (file)
--- a/uip/mhmail.c
+++ b/uip/mhmail.c
@@ -65,7 +65,8 @@ 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);
 
@@ -74,10 +75,10 @@ main(int argc, char **argv)
                                                "%s addrs... [switches]",
                                                invo_name);
                                print_help(buf, switches, 0);
-                               done(1);
+                               exit(0);
                        case VERSIONSW:
                                print_version(invo_name);
-                               done(1);
+                               exit(0);
 
                        case FROMSW:
                                if (!(from = *argp++) || *from == '-')
@@ -168,7 +169,8 @@ main(int argc, char **argv)
                if (in == -1 || out == -1) {
                        fprintf(stderr, "Letter left at %s.\n",
                                        tmpfil);
-                       done(status ? 1 : 0);
+                       /* sysexits.h exit-status from spost */
+                       exit(status ? 1 : 0);
                }
                cpydata(in, out, tmpfil, "dead.letter");
                close(in);
@@ -176,8 +178,8 @@ main(int argc, char **argv)
                fprintf(stderr, "Letter saved in dead.letter\n");
        }
        unlink(tmpfil);
-       done(status ? 1 : 0);
-       return 0;  /* dead code to satisfy the compiler */
+       /* sysexits.h exit status from spost */
+       exit(status ? 1 : 0);
 }
 
 
@@ -185,6 +187,6 @@ static void
 intrser(int i)
 {
        unlink(tmpfil);
-       done(i != 0 ? 1 : 0);
+       exit(i != 0 ? 1 : 0);
 }