Renamed the mbx_* functions to mbox_*, because mbx is another mail box format.

[mmh] / uip / rcvpack.c

diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index 85de619..e00e1fd 100644 (file)
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -10,7 +10,6 @@
 #include <h/dropsbr.h>
 #include <h/rcvmail.h>
 #include <h/tws.h>
-#include <h/mts.h>
 
 static struct swit switches[] = {
 #define VERSIONSW  0
@@ -36,7 +35,6 @@ main(int argc, char **argv)
        /* read user profile/context */
        context_read();
 
-       mts_init(invo_name);
        arguments = getarguments(invo_name, argc, argv, 1);
        argp = arguments;
 
@@ -67,24 +65,28 @@ main(int argc, char **argv)
                        file = cp;
        }
 
-       if (!file)
-               adios(NULL, "%s [switches] file", invo_name);
-
-       rewind(stdin);
+       /* copy stdin to stdout, converting rfc822 message to mbox */
+       if (!file) {
+               if (mbox_copy(fileno(stdout), fileno(stdin)) == NOTOK) {
+                       done(RCV_MBX);
+               }
+               done(RCV_MOK);
+               return 1;
+       }
 
        /* open and lock the file */
-       if ((md = mbx_open(file, getuid(), getgid(), m_gmprot()))
+       if ((md = mbox_open(file, getuid(), getgid(), m_gmprot()))
                        == NOTOK)
                done(RCV_MBX);
 
        /* append the message */
-       if (mbx_copy(file, md, fileno(stdin), 0) == NOTOK) {
-               mbx_close(file, md);
+       if (mbox_copy(md, fileno(stdin)) == NOTOK) {
+               mbox_close(file, md);
                done(RCV_MBX);
        }
 
        /* close and unlock the file */
-       if (mbx_close(file, md) == NOTOK)
+       if (mbox_close(file, md) == NOTOK)
                done(RCV_MBX);
 
        done(RCV_MOK);