X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpick.c;h=e4d1370440d089a26b6f4b2810b551c749d85d02;hp=69b9415009ff448624ba46bb34187c22259d3db3;hb=0b40f7c1c35770622511eda71ec5353784ea1dc6;hpb=097c84b61603c4a4c5837f3dcc09c30a1e751702

diff --git a/uip/pick.c b/uip/pick.c
index 69b9415..e4d1370 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -182,25 +182,22 @@ 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.
 	*/
 	if (!msgs.size)
-		app_msgarg(&msgs, "all");
+		app_msgarg(&msgs, seq_all);
 
 	if (!folder)
-		folder = getfolder(FCUR);
-	maildir = m_maildir(folder);
+		folder = getcurfol();
+	maildir = toabsdir(folder);
 
 	if (chdir(maildir) == NOTOK)
 		adios(maildir, "unable to change directory to");
@@ -291,7 +288,7 @@ main(int argc, char **argv)
 		printf("%d hit%s\n", mp->numsel, mp->numsel == 1 ? "" : "s");
 	}
 
-	context_replace(pfolder, folder);  /* update current folder */
+	context_replace(curfolder, folder);  /* update current folder */
 	seq_save(mp);  /* synchronize message sequences */
 	context_save();  /* save the context file */
 	folder_free(mp);  /* free folder/message structure */