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

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 868ed47..99ec48c 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) {