X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhtest.c;h=df5985fac4ab45682f0d285cbf849928043acbd2;hp=454fa1d43933085ca7179b9333fb7eb13070ec33;hb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0;hpb=6e8aba3714fe8ffc21dbb75ea9efdc41ab87b07f

diff --git a/uip/mhtest.c b/uip/mhtest.c
index 454fa1d..df5985f 100644
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -203,14 +203,14 @@ do_cache:
 				if (!(cp = *argp++) || (*cp == '-' && cp[1]))
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
-				file = *cp == '-' ? cp : path(cp, TFILE);
+				file = *cp == '-' ? cp : getcpy(expanddir(cp));
 				continue;
 
 			case OUTFILESW:
 				if (!(cp = *argp++) || (*cp == '-' && cp[1]))
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
-				outfile = *cp == '-' ? cp : path(cp, TFILE);
+				outfile = *cp == '-' ? cp : getcpy(expanddir(cp));
 				continue;
 
 			case VERBSW:
@@ -228,7 +228,7 @@ do_cache:
 			if (folder)
 				adios(NULL, "only one folder at a time!");
 			else
-				folder = pluspath(cp);
+				folder = getcpy(expandfol(cp));
 		} else
 			app_msgarg(&msgs, cp);
 	}
@@ -249,7 +249,7 @@ do_cache:
 	/* Check for private cache location */
 	if (!(cache_private = context_find(nmhprivcache)))
 		cache_private = ".cache";
-	cache_private = getcpy(m_maildir(cache_private));
+	cache_private = getcpy(toabsdir(cache_private));
 
 	/*
 	** Check for storage directory.  If specified,
@@ -259,7 +259,7 @@ do_cache:
 	if ((cp = context_find(nmhstorage)) && *cp)
 		tmp = concat(cp, "/", invo_name, NULL);
 	else
-		tmp = add(m_maildir(invo_name), NULL);
+		tmp = getcpy(toabsdir(invo_name));
 
 	if (file && msgs.size)
 		adios(NULL, "cannot specify msg and file at same time!");
@@ -281,8 +281,8 @@ do_cache:
 		if (!msgs.size)
 			app_msgarg(&msgs, "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");