X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=uip%2Fflist.c;h=d85ad61c31729fc651817b5d50ad04736698e85f;hb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0;hp=a86d226c8430ad3dc592a341bad879f3b4e7b662;hpb=c20b4fa14515c7ab388ce35411d89a7a92300711;p=mmh

diff --git a/uip/flist.c b/uip/flist.c
index a86d226..d85ad61 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,21 +229,17 @@ main(int argc, char **argv)
 				foldersToDo = (char **) mh_xrealloc(foldersToDo, (size_t) (maxfolders * sizeof(*foldersToDo)));
 			}
 			if (*cp == '+' || *cp == '@') {
-				foldersToDo[numfolders++] =
-					pluspath(cp);
+				foldersToDo[numfolders++] = getcpy(expandfol(cp));
 			} else
 				foldersToDo[numfolders++] = cp;
 		}
 	}
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
-
 	/* get current folder */
-	strncpy(curfolder, getfolder(1), sizeof(curfolder));
+	strncpy(curfolder, getcurfol(), sizeof(curfolder));
 
 	/* get nmh base directory */
-	nmhdir = m_maildir("");
+	nmhdir = toabsdir("+");
 
 	/*
 	** If we didn't specify any sequences, we search