X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frepl.c;h=058b536757e29e33479f704d225787c0cf5348cc;hp=fd92101fcb9ce753a776ed0bda0163cde8e8886c;hb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0;hpb=6e8aba3714fe8ffc21dbb75ea9efdc41ab87b07f

diff --git a/uip/repl.c b/uip/repl.c
index fd92101..058b536 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -199,7 +199,7 @@ main(int argc, char **argv)
 						adios(NULL, "missing argument to %s", argp[-2]);
 					dp = NULL;
 					if (*cp == '@')
-						cp = dp = pluspath(cp);
+						cp = dp = getcpy(expandfol(cp));
 					if (fcc)
 						fcc = add(", ", fcc);
 					fcc = add(cp, fcc);
@@ -212,7 +212,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 == '-')
@@ -267,7 +267,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 {
 			if (msg)
 				adios(NULL, "only one message at a time!");
@@ -289,7 +289,7 @@ main(int argc, char **argv)
 		adios(NULL, "can't mix files and folders/msgs");
 
 #ifdef MHE
-	strncpy(drft, buildsw ? m_maildir("reply")
+	strncpy(drft, buildsw ? toabsdir("reply")
 		: m_draft("new"), sizeof(drft));
 #else
 	strncpy(drft, m_draft("new"), sizeof(drft));
@@ -307,8 +307,8 @@ main(int argc, char **argv)
 		if (!msg)
 			msg = "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");