X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshow.c;h=b1f3d3d0d9e5a328734e8ad983633d7c50175ff8;hb=684ec30d81e1223a282764452f4902ed4ad1c754;hp=ea66f32a8a3a4048cc9382d057bc9e856d99c0af;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh

diff --git a/uip/mhshow.c b/uip/mhshow.c
index ea66f32..b1f3d3d 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -147,7 +147,7 @@ main(int argc, char **argv)
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
 #endif
-	invo_name = r1bindex(argv[0], '/');
+	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
 	context_read();
@@ -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);
 	}
@@ -295,7 +295,7 @@ do_cache:
 
 	set_endian();
 
-	if ((cp = getenv("MM_NOASK")) && !strcmp(cp, "1")) {
+	if ((cp = getenv("MM_NOASK")) && strcmp(cp, "1")==0) {
 		nolist  = 1;
 		pausesw = 0;
 	}
@@ -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!");
@@ -361,10 +358,10 @@ do_cache:
 		** message(s) are coming from a folder
 		*/
 		if (!msgs.size)
-			app_msgarg(&msgs, "cur");
+			app_msgarg(&msgs, seq_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 */
 	}