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

diff --git a/uip/install-mh.c b/uip/install-mh.c
index 50854f0..615ac71 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);
 
@@ -126,8 +126,7 @@ main(int argc, char **argv)
 	}
 
 	if (!autof && gans("Do you want help? ", anoyes)) {
-		(void)printf(
-		 "\n"
+		printf("\n"
 		 "Prior to using nmh, it is necessary to have a file in your login\n"
 		 "directory (%s) named %s which contains information\n"
 		 "to direct certain nmh operations.  The only item which is required\n"
@@ -198,10 +197,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();
 
 	/*