X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Ffolder.c;h=4fa9424bd3ef15c98dc0e50dd232c15ac1cab5ab;hp=06788b28eb210d9a448f34b764ce4925595bc987;hb=097c84b61603c4a4c5837f3dcc09c30a1e751702;hpb=714b5c530ece27ea2835a313013f5b770163403c

diff --git a/uip/folder.c b/uip/folder.c
index 06788b2..4fa9424 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -122,7 +122,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();
@@ -273,15 +273,15 @@ main(int argc, char **argv)
 			} else {
 				adios(NULL, "no other folder");
 			}
-			for (cp = getcpy(getfolder(1)); *ap; ap++)
+			for (cp = getcpy(getfolder(FCUR)); *ap; ap++)
 				cp = add(*ap, add(" ", cp));
 			free(dp);
 			context_replace(stack, cp);  /* update folder stack */
 		} else {
 			/* update folder stack */
 			context_replace(stack, (cp = context_find (stack)) ?
-					concat(getfolder(1), " ", cp, NULL) :
-					getcpy(getfolder(1)));
+					concat(getfolder(FCUR), " ", cp, NULL) :
+					getcpy(getfolder(FCUR)));
 		}
 	}
 
@@ -320,7 +320,7 @@ main(int argc, char **argv)
 
 	/* Listing the folder stack */
 	if (listsw) {
-		printf("%s", argfolder ? argfolder : getfolder(1));
+		printf("%s", argfolder ? argfolder : getfolder(FCUR));
 		if ((cp = context_find(stack))) {
 			dp = getcpy(cp);
 			for (ap = brkstring(dp, " ", "\n"); *ap; ap++)
@@ -658,7 +658,7 @@ readonly_folders(void)
 	atrlen = strlen(atrcur);
 
 	for (np = m_defs; np; np = np->n_next)
-		if (ssequal(atrcur, np->n_name)
-				&& !ssequal(nmhdir, np->n_name + atrlen))
+		if (isprefix(atrcur, np->n_name)
+				&& !isprefix(nmhdir, np->n_name + atrlen))
 			get_folder_info(np->n_name + atrlen, NULL);
 }