X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fforw.c;h=3ce0b216f0a18f1e130671cc67c7a86362558123;hp=13aaaa9992e03a085f3c415b448a0317482e3271;hb=682962d94b21e120c78a52a8bdcb6aa994330a14;hpb=240013872c392fe644bd4f79382d9f5314b4ea60

diff --git a/uip/forw.c b/uip/forw.c
index 13aaaa9..3ce0b21 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(1);
-		maildir = m_maildir(folder);
+			folder = getcurfol();
+		maildir = toabsdir(folder);
 
 		if (chdir(maildir) == NOTOK)
 			adios(maildir, "unable to change directory to");
@@ -351,7 +349,7 @@ main(int argc, char **argv)
 			context_replace(buf, getcpy(value));
 		}
 
-		context_replace(pfolder, folder);  /* update current folder */
+		context_replace(curfolder, folder); /* update current folder */
 		seq_setcur(mp, mp->lowsel);  /* update current message */
 		seq_save(mp);  /* synchronize sequences */
 		context_save();  /* save the context file */