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

[mmh] / uip / rcvstore.c

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 868ed47..ebf3e14 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -63,12 +63,11 @@ main(int argc, char **argv)
 #ifdef LOCALE
        setlocale(LC_ALL, "");
 #endif
-       invo_name = r1bindex(argv[0], '/');
+       invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
        context_read();
 
-       mts_init(invo_name);
        arguments = getarguments(invo_name, argc, argv, 1);
        argp = arguments;
 
@@ -135,7 +134,7 @@ main(int argc, char **argv)
                        if (folder)
                                adios(NULL, "only one folder at a time!");
                        else
-                               folder = pluspath(cp);
+                               folder = getcpy(expandfol(cp));
                } else {
                        adios(NULL, "usage: %s [+folder] [switches]",
                                        invo_name);
@@ -144,13 +143,10 @@ main(int argc, char **argv)
 
        seqs[seqp] = NULL;  /* NULL terminate list of sequences */
 
-       if (!context_find("path"))
-               free(path("./", TFOLDER));
-
        /* if no folder is given, use default folder */
        if (!folder)
-               folder = getfolder(0);
-       maildir = m_maildir(folder);
+               folder = getdeffol();
+       maildir = toabsdir(folder);
 
        /* check if folder exists */
        if (stat(maildir, &st) == NOTOK) {
@@ -205,8 +201,8 @@ main(int argc, char **argv)
        ** Link message into folder, and possibly add
        ** to the Unseen-Sequence's.
        */
-       if ((msgnum = folder_addmsg(&mp, tmpfilenam, 0, unseensw, 0, 0,
-                       (char *)0)) == -1)
+       if ((msgnum = folder_addmsg(&mp, tmpfilenam, 0, unseensw, 0, 0, NULL))
+                       == -1)
                done(1);
 
        /*
@@ -218,7 +214,7 @@ main(int argc, char **argv)
                        done(1);
        }
 
-       seq_setunseen(mp, 0);  /* synchronize any Unseen-Sequence's */
+       seq_setunseen(mp, 1);  /* add new msgs to unseen sequences */
        seq_save(mp);  /* synchronize and save message sequences */
        folder_free(mp);  /* free folder/message structure */