X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshow.c;h=a090e2e08d64a7ea40ddb4489c6bc69af5f5067a;hb=a7771fd2e83d64228fb675749fc936151249dbd3;hp=ba5c037e18ab8403a230b73733fd5af17c6ec1e2;hpb=240013872c392fe644bd4f79382d9f5314b4ea60;p=mmh

diff --git a/uip/mhshow.c b/uip/mhshow.c
index ba5c037..a090e2e 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,10 +338,7 @@ do_cache:
 	if ((cp = context_find(nmhstorage)) && *cp)
 		tmp = concat(cp, "/", invo_name, NULL);
 	else
-		tmp = add(m_maildir(invo_name), NULL);
-
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
+		tmp = getcpy(toabsdir(invo_name));
 
 	if (file && msgs.size)
 		adios(NULL, "cannot specify msg and file at same time!");
@@ -363,8 +360,8 @@ do_cache:
 		if (!msgs.size)
 			app_msgarg(&msgs, "cur");
 		if (!folder)
-			folder = getfolder(1);
-		maildir = m_maildir(folder);
+			folder = getcurfol();
+		maildir = toabsdir(folder);
 
 		if (chdir(maildir) == NOTOK)
 			adios(maildir, "unable to change directory to");
@@ -392,7 +389,7 @@ do_cache:
 				set_unseen(mp, msgnum);
 
 		seq_setprev(mp);  /* set the Previous-Sequence */
-		seq_setunseen(mp, 1);  /* unset the Unseen-Sequence */
+		seq_setunseen(mp, 0);  /* unset unseen seqs for shown msgs */
 
 		if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1),
 				sizeof(*cts))))
@@ -449,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 */
 	}