X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fpackf.c;h=9bb61f50ab1bdf7d67d6caee1d14dd3dac4f5270;hb=682962d94b21e120c78a52a8bdcb6aa994330a14;hp=5e171475bd11cb87193e906d54303d48fafa7d64;hpb=3d78b9c80a95f4e7885ed607018f9b1b9be559b4;p=mmh

diff --git a/uip/packf.c b/uip/packf.c
index 5e17147..9bb61f5 100644
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -98,14 +98,14 @@ main(int argc, char **argv)
 		if (*cp == '+' || *cp == '@') {
 			if (folder)
 				adios(NULL, "only one folder at a time!");
-			folder = pluspath(cp);
+			folder = getcpy(expandfol(cp));
 		} else
 			app_msgarg(&msgs, cp);
 	}
 
 	if (!file)
 		file = "./msgbox";
-	file = path(file, TFILE);
+	file = getcpy(expanddir(file));
 
 	/*
 	** Check if file to be created (or appended to)
@@ -125,8 +125,8 @@ main(int argc, char **argv)
 		app_msgarg(&msgs, "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 ");
@@ -169,7 +169,7 @@ main(int argc, char **argv)
 	/* close and unlock maildrop file */
 	mbx_close(file, md);
 
-	context_replace(pfolder, folder);  /* update current folder */
+	context_replace(curfolder, folder);  /* update current folder */
 	if (mp->hghsel != mp->curmsg)
 		seq_setcur(mp, mp->lowsel);
 	seq_save(mp);