X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshow.c;h=07a05a9bfa62047905d3907df2acb14a783d0ce5;hb=f387b393dfab5cb5c00974b1807e8633531e0774;hp=42e0ee06867d8a99fcf1d974d79eec250b9d1f46;hpb=3d78b9c80a95f4e7885ed607018f9b1b9be559b4;p=mmh

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 42e0ee0..07a05a9 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -238,7 +238,7 @@ 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 FORMSW:
@@ -284,7 +284,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);
 	}
@@ -328,7 +328,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,
@@ -338,7 +338,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!");
@@ -360,8 +360,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");
@@ -446,8 +446,8 @@ do_cache:
 
 	/* If reading from a folder, do some updating */
 	if (mp) {
-		context_replace(pfolder, folder);  /* update current folder */
-		seq_setcur(mp, mp->hghsel);       /* update current message */
+		context_replace(curfolder, folder); /* update current folder */
+		seq_setcur(mp, mp->hghsel);        /* update current message */
 		seq_save(mp);                      /* synchronize sequences */
 		context_save();                    /* save the context file */
 	}