X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fshow.c;h=977b0e41ffd131bc914805fbdd917b701303bed9;hp=fb517d12f4d7e45e082471e83ed75c14cd254bbd;hb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0;hpb=6e8aba3714fe8ffc21dbb75ea9efdc41ab87b07f

diff --git a/uip/show.c b/uip/show.c
index fb517d1..977b0e4 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -112,7 +112,7 @@ usage:
 						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 HEADSW:
@@ -164,7 +164,7 @@ usage:
 			if (folder)
 				adios(NULL, "only one folder at a time!");
 			else
-				folder = pluspath(cp);
+				folder = getcpy(expandfol(cp));
 		} else if (mode != SHOW) {
 			goto usage;
 		} else {
@@ -203,8 +203,8 @@ usage:
 	}
 
 	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");
@@ -333,7 +333,7 @@ go_to_it: ;
 	if (!strcmp(mhbasename(proc), "mhl")
 			&& !file
 			&& chdir(maildir =
-			concat(m_maildir(""), "/", NULL)) != NOTOK) {
+			concat(toabsdir("+"), "/", NULL)) != NOTOK) {
 		mp->foldpath = concat(mp->foldpath, "/", NULL);
 		cp = isprefix(maildir, mp->foldpath)
 			? mp->foldpath + strlen(maildir)
@@ -375,7 +375,7 @@ is_nontext(char *msgnam)
 				int passno;
 				char c;
 
-				cp = add(buf, NULL);
+				cp = getcpy(buf);
 				while (state == FLDPLUS) {
 					state = m_getfld(state, name, buf,
 							sizeof(buf), fp);
@@ -481,7 +481,7 @@ out:
 			** Check Content-Transfer-Encoding field
 			*/
 			if (!mh_strcasecmp(name, ENCODING_FIELD)) {
-				cp = add(buf, NULL);
+				cp = getcpy(buf);
 				while (state == FLDPLUS) {
 					state = m_getfld(state, name, buf,
 							sizeof(buf), fp);