X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Finstall-mh.c;h=30ac8f6ca5825e7fc62205622c863d1745e1c5c2;hp=50854f0c3b3bc68a2e76bb5a21147c192a799611;hb=682962d94b21e120c78a52a8bdcb6aa994330a14;hpb=714b5c530ece27ea2835a313013f5b770163403c

diff --git a/uip/install-mh.c b/uip/install-mh.c
index 50854f0..30ac8f6 100644
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -43,7 +43,7 @@ main(int argc, char **argv)
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
 #endif
-	invo_name = r1bindex(argv[0], '/');
+	invo_name = mhbasename(argv[0]);
 	arguments = getarguments(invo_name, argc, argv, 0);
 	argp = arguments;
 
@@ -102,7 +102,7 @@ main(int argc, char **argv)
 	*/
 
 	if ((cp = getenv("MH")) && *cp != '\0')
-		defpath = path(cp, TFILE);
+		defpath = getcpy(expanddir(cp));
 	else
 		defpath = concat(mypath, "/", mh_profile, NULL);
 
@@ -198,10 +198,10 @@ query:
 		fclose(in);
 	}
 
-	ctxpath = getcpy(m_maildir(context = "context"));
+	ctxpath = getcpy(toabsdir(context = "context"));
 
 	/* Initialize current folder to default */
-	context_replace(pfolder, defaultfolder);
+	context_replace(curfolder, defaultfolder);
 	context_save();
 
 	/*