X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frcvpack.c;h=352f785b6bbf0affc7ed33ac6b48086d602764d2;hb=96d10c193324201ef8acb622ed13e9a5ecb59827;hp=d6e102575fb629fe84066c80f676a6f48ec58e62;hpb=33dc8211a72df0c27fa11220f3b27583cd1c7e49;p=mmh

diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index d6e1025..352f785 100644
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -13,7 +13,7 @@
 
 static struct swit switches[] = {
 #define VERSIONSW  0
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  1
 	{ "help", 0 },
 	{ NULL, 0 }
@@ -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)
@@ -65,26 +63,30 @@ 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) {
+			exit(RCV_MBX);
+		}
+		exit(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);
+		exit(RCV_MBX);
 
 	/* append the message */
-	if (mbx_copy(file, md, fileno(stdin), 0) == NOTOK) {
-		mbx_close(file, md);
-		done(RCV_MBX);
+	if (mbox_copy(md, fileno(stdin)) == NOTOK) {
+		mbox_close(file, md);
+		exit(RCV_MBX);
 	}
 
 	/* close and unlock the file */
-	if (mbx_close(file, md) == NOTOK)
-		done(RCV_MBX);
+	if (mbox_close(file, md) == NOTOK)
+		exit(RCV_MBX);
 
-	done(RCV_MOK);
+	exit(RCV_MOK);
 	return 1;
 }