X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d2f12554a254e814dcdafb3828fc0d9936154eef..11cf7b43a23ad3e3b7d80e485c90c4e0ab9b6066:/uip/mshcmds.c

diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index f2c913cd..147a261b 100644
--- a/uip/mshcmds.c
+++ b/uip/mshcmds.c
@@ -593,7 +593,7 @@ filehak (char **args)
 	if (cwd == NULL)
 	    cwd = getcpy (pwd ());
 	chdir (m_maildir (""));
-	cp = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+	cp = pluspath (cp);
 	if (access (m_maildir (cp), F_OK) == NOTOK)
 	    result = OK;
 	free (cp);
@@ -703,7 +703,7 @@ foldcmd (char **args)
 		return;
 	    }
 	    else
-		folder = fmsh ? path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF)
+		folder = fmsh ? pluspath (cp)
 			    : cp + 1;
 	}
 	else
@@ -2547,7 +2547,8 @@ static int
 is_nontext (int msgnum)
 {
     int	result, state;
-    char *bp, *cp, *dp;
+    unsigned char *bp, *dp;
+    char *cp;
     char buf[BUFSIZ], name[NAMESZ];
     FILE *fp;
 
@@ -2960,7 +2961,8 @@ subsort (struct Msg *a, struct Msg *b)
 static char *
 sosmash (char *subj, char *s)
 {
-    register char *cp, *dp, c;
+    register char *cp, *dp;
+    register unsigned char c;
 
     if (s) {
 	cp = s;