X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frcvpack.c;h=352f785b6bbf0affc7ed33ac6b48086d602764d2;hb=5a12e4b0477d3ad699f5713682d26079f2792d17;hp=fe98a449e01054f36b46611f9232d93385877b06;hpb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;p=mmh diff --git a/uip/rcvpack.c b/uip/rcvpack.c index fe98a44..352f785 100644 --- a/uip/rcvpack.c +++ b/uip/rcvpack.c @@ -27,9 +27,7 @@ main(int argc, char **argv) char *cp, *file = NULL, buf[BUFSIZ]; char **argp, **arguments; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ @@ -44,7 +42,7 @@ main(int argc, char **argv) switch (smatch(++cp, switches)) { case AMBIGSW: ambigsw(cp, switches); - done(1); + exit(1); case UNKWNSW: adios(NULL, "-%s unknown", cp); @@ -53,10 +51,10 @@ main(int argc, char **argv) "%s [switches] file", invo_name); print_help(buf, switches, 1); - done(1); + exit(0); case VERSIONSW: print_version(invo_name); - done(1); + exit(0); } } if (file) @@ -68,27 +66,27 @@ main(int argc, char **argv) /* copy stdin to stdout, converting rfc822 message to mbox */ if (!file) { if (mbox_copy(fileno(stdout), fileno(stdin)) == NOTOK) { - done(RCV_MBX); + exit(RCV_MBX); } - done(RCV_MOK); + exit(RCV_MOK); return 1; } /* open and lock the file */ if ((md = mbox_open(file, getuid(), getgid(), m_gmprot())) == NOTOK) - done(RCV_MBX); + exit(RCV_MBX); /* append the message */ if (mbox_copy(md, fileno(stdin)) == NOTOK) { mbox_close(file, md); - done(RCV_MBX); + exit(RCV_MBX); } /* close and unlock the file */ if (mbox_close(file, md) == NOTOK) - done(RCV_MBX); + exit(RCV_MBX); - done(RCV_MOK); + exit(RCV_MOK); return 1; }