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

diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index f5b1c05..fe98a44 100644
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -1,103 +1,94 @@
-
 /*
- * rcvpack.c -- append message to a file
- *
- * $Id$
- */
+** rcvpack.c -- append message to a file
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
 
 #include <h/mh.h>
 #include <h/dropsbr.h>
 #include <h/rcvmail.h>
-#include <zotnet/tws/tws.h>
-#include <zotnet/mts/mts.h>
+#include <h/tws.h>
 
 static struct swit switches[] = {
-#define MBOXSW       0
-    { "mbox", 0 },
-#define MMDFSW       1
-    { "mmdf", 0 },
-#define VERSIONSW    2
-    { "version", 0 },
-#define	HELPSW       3
-    { "help", 0 },
-    { NULL, 0 }
+#define VERSIONSW  0
+	{ "Version", 0 },
+#define HELPSW  1
+	{ "help", 0 },
+	{ NULL, 0 }
 };
 
-/*
- * default format in which to save messages
- */
-static int mbx_style = MBOX_FORMAT;
-
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
-    int md;
-    char *cp, *file = NULL, buf[BUFSIZ];
-    char **argp, **arguments;
+	int md;
+	char *cp, *file = NULL, buf[BUFSIZ];
+	char **argp, **arguments;
 
 #ifdef LOCALE
-    setlocale(LC_ALL, "");
+	setlocale(LC_ALL, "");
 #endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
-
-    mts_init (invo_name);
-    arguments = getarguments (invo_name, argc, argv, 1);
-    argp = arguments;
-
-    /* parse arguments */
-    while ((cp = *argp++)) {
-	if (*cp == '-') {
-	    switch (smatch (++cp, switches)) {
-		case AMBIGSW: 
-		    ambigsw (cp, switches);
-		    done (1);
-		case UNKWNSW: 
-		    adios (NULL, "-%s unknown", cp);
-
-		case HELPSW: 
-		    snprintf (buf, sizeof(buf), "%s [switches] file", invo_name);
-		    print_help (buf, switches, 1);
-		    done (1);
-		case VERSIONSW:
-		    print_version(invo_name);
-		    done (1);
-
-		case MBOXSW:
-		    mbx_style = MBOX_FORMAT;
-		    continue;
-		case MMDFSW:
-		    mbx_style = MMDF_FORMAT;
-		    continue;
-	    }
+	invo_name = mhbasename(argv[0]);
+
+	/* read user profile/context */
+	context_read();
+
+	arguments = getarguments(invo_name, argc, argv, 1);
+	argp = arguments;
+
+	/* parse arguments */
+	while ((cp = *argp++)) {
+		if (*cp == '-') {
+			switch (smatch(++cp, switches)) {
+			case AMBIGSW:
+				ambigsw(cp, switches);
+				done(1);
+			case UNKWNSW:
+				adios(NULL, "-%s unknown", cp);
+
+			case HELPSW:
+				snprintf(buf, sizeof(buf),
+						"%s [switches] file",
+						invo_name);
+				print_help(buf, switches, 1);
+				done(1);
+			case VERSIONSW:
+				print_version(invo_name);
+				done(1);
+			}
+		}
+		if (file)
+			adios(NULL, "only one file at a time!");
+		else
+			file = cp;
 	}
-	if (file)
-	    adios (NULL, "only one file at a time!");
-	else
-	    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, mbx_style, getuid(), getgid(), m_gmprot())) == NOTOK)
-	done (RCV_MBX);
+	/* open and lock the file */
+	if ((md = mbox_open(file, getuid(), getgid(), m_gmprot()))
+			== NOTOK)
+		done(RCV_MBX);
 
-    /* append the message */
-    if (mbx_copy (file, mbx_style, md, fileno(stdin), 1, NULL, 0) == NOTOK) {
-	mbx_close (file, md);
-	done (RCV_MBX);
-    }
+	/* append the message */
+	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)
-	done (RCV_MBX);
+	/* close and unlock the file */
+	if (mbox_close(file, md) == NOTOK)
+		done(RCV_MBX);
 
-    return done (RCV_MOK);
+	done(RCV_MOK);
+	return 1;
 }