X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fshow.c;h=757b0018e337f9b6806df3ff82e697ac7658b4c1;hp=fb517d12f4d7e45e082471e83ed75c14cd254bbd;hb=682962d94b21e120c78a52a8bdcb6aa994330a14;hpb=3d78b9c80a95f4e7885ed607018f9b1b9be559b4

diff --git a/uip/show.c b/uip/show.c
index fb517d1..757b001 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");
@@ -244,7 +244,7 @@ usage:
 
 	seq_setcur(mp, mp->hghsel);  /* update current message  */
 	seq_save(mp);  /* synchronize sequences   */
-	context_replace(pfolder, folder);  /* update current folder   */
+	context_replace(curfolder, folder);  /* update current folder   */
 	context_save();  /* save the context file   */
 
 	if (headersw && vecp == 2)
@@ -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);