X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fflist.c;h=aef291a621f787c8454b730111b19415585f60fb;hb=5048c3273f8780b3d73e81d0ea5b434f53a83f9f;hp=0f44555de992721e0105393a1c06a18d6e0aa41a;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh

diff --git a/uip/flist.c b/uip/flist.c
index 0f44555..aef291a 100644
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -128,7 +128,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();
@@ -229,18 +229,14 @@ main(int argc, char **argv)
 				foldersToDo = (char **) mh_xrealloc(foldersToDo, (size_t) (maxfolders * sizeof(*foldersToDo)));
 			}
 			if (*cp == '+' || *cp == '@') {
-				foldersToDo[numfolders++] =
-					pluspath(cp);
+				foldersToDo[numfolders++] = pluspath(cp);
 			} else
 				foldersToDo[numfolders++] = cp;
 		}
 	}
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
-
 	/* get current folder */
-	strncpy(curfolder, getfolder(1), sizeof(curfolder));
+	strncpy(curfolder, getfolder(FCUR), sizeof(curfolder));
 
 	/* get nmh base directory */
 	nmhdir = m_maildir("");
@@ -691,7 +687,7 @@ do_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))
 			BuildFolderList(np->n_name + atrlen, 0);
 }