X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhpath.c;h=5009a2fe7e96d5d4c93a750ac0767725fe96ccd0;hb=246ca516a0f7b870316116bc184347b0fb2bc00b;hp=6f53aba6a4c4ac82ad9fe59b0509d6b418106a30;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh

diff --git a/uip/mhpath.c b/uip/mhpath.c
index 6f53aba..5009a2f 100644
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -30,7 +30,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();
@@ -63,17 +63,14 @@ main(int argc, char **argv)
 			if (folder)
 				adios(NULL, "only one folder at a time!");
 			else
-				folder = pluspath(cp);
+				folder = getcpy(expandfol(cp));
 		} else
 			app_msgarg(&msgs, cp);
 	}
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
-
 	if (!folder)
-		folder = getfolder(1);
-	maildir = m_maildir(folder);
+		folder = getcurfol();
+	maildir = toabsdir(folder);
 
 	/* If no messages are given, print folder pathname */
 	if (!msgs.size) {