X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frcvstore.c;h=b9342209d57d2268c7134c190f6afa38b54e6d33;hb=fd00a3b030ab9d854eac79641f7bf25e6538acc1;hp=06b8b694d69049fcc08800e101fbe05a9b89b793;hpb=240013872c392fe644bd4f79382d9f5314b4ea60;p=mmh

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 06b8b69..b934220 100644
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -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);
 
 	/*