X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frcvstore.c;h=b9342209d57d2268c7134c190f6afa38b54e6d33;hb=f387b393dfab5cb5c00974b1807e8633531e0774;hp=868ed47b111702875102385647599aec9dc071d8;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 868ed47..b934220 100644
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -63,7 +63,7 @@ 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();
@@ -135,7 +135,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 +144,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 +202,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);
 
 	/*