X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fforw.c;h=3f940f7b8034528ccabf78d0ce031e7907fc4ea1;hp=666228b73d866e3be398417df7e6c7bd03765c01;hb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0;hpb=6e8aba3714fe8ffc21dbb75ea9efdc41ab87b07f

diff --git a/uip/forw.c b/uip/forw.c
index 666228b..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;
 		}
@@ -245,7 +245,7 @@ main(int argc, char **argv)
 		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));
@@ -263,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");