X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fforw.c;h=3f940f7b8034528ccabf78d0ce031e7907fc4ea1;hp=002bb675a86366e4f63bad8247ffc03ec67de647;hb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0;hpb=097c84b61603c4a4c5837f3dcc09c30a1e751702

diff --git a/uip/forw.c b/uip/forw.c
index 002bb67..3f940f7 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -168,7 +168,7 @@ main(int argc, char **argv)
 						adios(NULL, "only one file at a time!");
 					if (!(cp = *argp++) || *cp == '-')
 						adios(NULL, "missing argument to %s", argp[-2]);
-					file = path(cp, TFILE);
+					file = getcpy(expanddir(cp));
 					continue;
 				case FILTSW:
 					if (!(cp = *argp++) || *cp == '-')
@@ -233,7 +233,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 {
 			msgs[msgp++] = cp;
 		}
@@ -241,13 +241,11 @@ main(int argc, char **argv)
 
 	cwd = getcpy(pwd());
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
 	if (file && (msgp || folder))
 		adios(NULL, "can't mix files and folders/msgs");
 
 #ifdef MHE
-	strncpy(drft, buildsw ? m_maildir("draft")
+	strncpy(drft, buildsw ? toabsdir("draft")
 		: m_draft("new"), sizeof(drft));
 #else
 	strncpy(drft, m_draft("new"), sizeof(drft));
@@ -265,8 +263,8 @@ main(int argc, char **argv)
 		if (!msgp)
 			msgs[msgp++] = "cur";
 		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");