X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Finstall-mh.c;h=d5c16d9eb137c9b8fcc7fa6d523560e9dc95df51;hb=7e3bc577e84e13a47005a706718bd6ec0e6a0e0a;hp=11f7bc566858af8b37493041d23b001a424ff04b;hpb=240013872c392fe644bd4f79382d9f5314b4ea60;p=mmh

diff --git a/uip/install-mh.c b/uip/install-mh.c
index 11f7bc5..d5c16d9 100644
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -85,7 +85,7 @@ main(int argc, char **argv)
 	** if that's not found.
 	*/
 
-	if ((mypath = getenv("HOME")) == (char *)0) {
+	if ((mypath = getenv("HOME")) == NULL) {
 		if ((pw = getpwuid(getuid())) == (struct passwd *)0 ||
 				*pw->pw_dir == '\0')
 			adios(NULL, "cannot determine your home directory");
@@ -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();
 
 	/*