X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fflist.c;h=d85ad61c31729fc651817b5d50ad04736698e85f;hp=4bf3f82ccbf6d73a03215eb9b0f72c8c949ba5ed;hb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0;hpb=240013872c392fe644bd4f79382d9f5314b4ea60

diff --git a/uip/flist.c b/uip/flist.c
index 4bf3f82..d85ad61 100644
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -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