X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpick.c;h=2efac4204821ef7905dacc5236d85dce1be7077e;hp=040ebecdc2bd31c87dacb897989c0c861de6f65a;hb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0;hpb=714b5c530ece27ea2835a313013f5b770163403c

diff --git a/uip/pick.c b/uip/pick.c
index 040ebec..2efac42 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -84,7 +84,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();
@@ -182,15 +182,12 @@ 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);
 	}
 	vec[vecp] = NULL;
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
-
 	/*
 	** If we didn't specify which messages to search,
 	** then search the whole folder.
@@ -199,8 +196,8 @@ main(int argc, char **argv)
 		app_msgarg(&msgs, "all");
 
 	if (!folder)
-		folder = getfolder(1);
-	maildir = m_maildir(folder);
+		folder = getcurfol();
+	maildir = toabsdir(folder);
 
 	if (chdir(maildir) == NOTOK)
 		adios(maildir, "unable to change directory to");