X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fshow.c;h=e7ecb72d7259e316b193419cb8cdc7d944d33832;hb=c477dc5d1d03fa6d9a8ab3dd3508c63cbddc044e;hp=f279cdedf675a1da8c49c04c893cafb1d1ad7116;hpb=a7771fd2e83d64228fb675749fc936151249dbd3;p=mmh

diff --git a/uip/show.c b/uip/show.c
index f279cde..e7ecb72 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -196,13 +196,13 @@ usage:
 	if (!msgp) {
 		switch (mode) {
 		case NEXT:
-			msgs[msgp++] = "next";
+			msgs[msgp++] = seq_next;
 			break;
 		case PREV:
-			msgs[msgp++] = "prev";
+			msgs[msgp++] = seq_prev;
 			break;
 		default:
-			msgs[msgp++] = "cur";
+			msgs[msgp++] = seq_cur;
 			break;
 		}
 	}
@@ -335,14 +335,14 @@ go_to_it: ;
 	** add the path to the message names.  Currently, we are just
 	** checking for mhn here, since we've already taken care of mhl.
 	*/
-	if (!strcmp(mhbasename(proc), "mhl")
+	if (strcmp(mhbasename(proc), "mhl")==0
 			&& !file
 			&& chdir(maildir =
 			concat(toabsdir("+"), "/", NULL)) != NOTOK) {
 		mp->foldpath = concat(mp->foldpath, "/", NULL);
-		cp = isprefix(maildir, mp->foldpath)
-			? mp->foldpath + strlen(maildir)
-			: mp->foldpath;
+		cp = (strncmp(mp->foldpath, maildir, strlen(maildir))==0) ?
+			mp->foldpath + strlen(maildir) :
+			mp->foldpath;
 		for (msgnum = procp; msgnum < vecp; msgnum++)
 			vec[msgnum] = concat(cp, vec[msgnum], NULL);
 	}