X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frcvpack.c;h=fe98a449e01054f36b46611f9232d93385877b06;hp=f0f1bd18351c83a669877aeac7a1ece1f34d7f09;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=d3540eaa4251b3a282115a72ed5d1bb39ce74b3f

diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index f0f1bd1..fe98a44 100644
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -10,11 +10,10 @@
 #include <h/dropsbr.h>
 #include <h/rcvmail.h>
 #include <h/tws.h>
-#include <h/mts.h>
 
 static struct swit switches[] = {
 #define VERSIONSW  0
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  1
 	{ "help", 0 },
 	{ NULL, 0 }
@@ -66,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);