Replaced mkinstalldirs with `mkdir -p'.

[mmh] / uip / rcvpack.c

diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index 84fcc26..d6e1025 100644 (file)
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -10,25 +10,15 @@
 #include <h/dropsbr.h>
 #include <h/rcvmail.h>
 #include <h/tws.h>
-#include <h/mts.h>
 
 static struct swit switches[] = {
-#define MBOXSW  0
-       { "mbox", 0 },
-#define MMDFSW  1
-       { "mmdf", 0 },
-#define VERSIONSW  2
+#define VERSIONSW  0
        { "version", 0 },
-#define HELPSW  3
+#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)
@@ -45,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;
 
@@ -53,28 +42,21 @@ main(int argc, char **argv)
        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;
+                       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)
@@ -89,13 +71,12 @@ main(int argc, char **argv)
        rewind(stdin);
 
        /* open and lock the file */
-       if ((md = mbx_open(file, mbx_style, getuid(), getgid(), m_gmprot()))
+       if ((md = mbx_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) {
+       if (mbx_copy(file, md, fileno(stdin), 0) == NOTOK) {
                mbx_close(file, md);
                done(RCV_MBX);
        }