Removed mts.conf; the maildelivery option went into slocal directly.

[mmh] / uip / slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index a81afa9..2573cbe 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -102,6 +102,11 @@ static struct swit switches[] = {
        { NULL, 0 }
 };
 
+
+/* global maildelivery file */
+char *maildelivery = NMHETCDIR"/maildelivery";
+
+
 static int globbed = 0;  /* have we built "vars" table yet? */
 static int parsed = 0;  /* have we built header field table yet   */
 static int utmped = 0;  /* have we scanned umtp(x) file yet */
@@ -220,7 +225,6 @@ main(int argc, char **argv)
        if (context_foil(NULL) == -1)
                done(1);
 
-       mts_init(invo_name);
        arguments = getarguments(invo_name, argc, argv, 0);
        argp = arguments;
 
@@ -405,8 +409,7 @@ main(int argc, char **argv)
 
        if (mbox == NULL) {
                snprintf(mailbox, sizeof(mailbox), "%s/%s",
-                               mmdfldir[0] ? mmdfldir : pw->pw_dir,
-                               mmdflfil[0] ? mmdflfil : pw->pw_name);
+                               mailspool, pw->pw_name);
                mbox = mailbox;
        }
        if (home == NULL)
@@ -1069,8 +1072,7 @@ usr_file(int fd, char *mailbox)
        lseek(fd, (off_t) 0, SEEK_SET);
 
        /* append message to file */
-       if (mbx_copy(mailbox, md, fd, NULL, verbose)
-                       == -1) {
+       if (mbx_copy(mailbox, md, fd, verbose) == -1) {
                if (verbose)
                        adorn("", "error writing to:");
                return -1;