X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Fcontext_read.c;h=6ca9a3d677127f2c2164541e1600a72771aa1d87;hb=a3ba584be2a9daf451bbe3c488d73703d14e8d53;hp=ea7d5da851085b57a9dee5de71ae19ea7bc52d86;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh

diff --git a/sbr/context_read.c b/sbr/context_read.c
index ea7d5da..6ca9a3d 100644
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -44,11 +44,12 @@ context_read(void)
 		return;
 
 	/*
-	** Find user's home directory.  Try the HOME environment variable first,
+	** Find user's home directory. Try the HOME environment variable first,
 	** the home directory field in the password file if that's not found.
 	*/
-	if ((mypath = getenv("HOME")) == (char *)0) {
-		if ((pw = getpwuid(getuid())) == (struct passwd *)0 || *pw->pw_dir == '\0')
+	if ((mypath = getenv("HOME")) == NULL) {
+		if ((pw = getpwuid(getuid())) == (struct passwd *)0 ||
+					*pw->pw_dir == '\0')
 			adios(NULL, "cannot determine your home directory");
 		else
 			mypath = pw->pw_dir;
@@ -63,18 +64,18 @@ context_read(void)
 	*/
 
 	if ((cp = getenv("MH")) && *cp != '\0') {
-	defpath = path(cp, TFILE);
+		defpath = getcpy(expanddir(cp));
 
-	if (stat(defpath, &st) != -1 && (st.st_mode & S_IFREG) == 0)
-		adios((char *)0, "`%s' specified by your MH environment variable is not a normal file", cp);
+		if (stat(defpath, &st) != -1 && (st.st_mode & S_IFREG) == 0)
+			adios(NULL, "`%s' specified by your MH environment variable is not a normal file", cp);
 
-	if ((ib = fopen(defpath, "r")) == (FILE *)0)
-		adios((char *)0, "unable to read the `%s' profile specified by your MH environment variable", defpath);
+		if ((ib = fopen(defpath, "r")) == (FILE *)0)
+			adios(NULL, "unable to read the `%s' profile specified by your MH environment variable", defpath);
 	} else {
 		defpath = concat(mypath, "/", mh_profile, NULL);
 
 		if ((ib = fopen(defpath, "r")) == (FILE *)0)
-			adios((char *)0, "Doesn't look like nmh is installed.  Run install-mh to do so.");
+			adios(NULL, "Doesn't look like nmh is installed.  Run install-mh to do so.");
 
 		cp = mh_profile;
 	}
@@ -88,14 +89,15 @@ context_read(void)
 	** one rooted in the home directory.
 	*/
 
-	if ((cp = context_find("path")) == (char *)0)
-		adios(NULL, "Your %s file does not contain a path entry.", defpath);
+	if ((cp = context_find("path")) == NULL)
+		adios(NULL, "Your %s file does not contain a path entry.",
+				defpath);
 
 	if (*cp == '\0')
 		adios(NULL, "Your `%s' profile file does not contain a valid path entry.", defpath);
 
 	if (*cp != '/')
-		(void)snprintf(nd = buf, sizeof(buf), "%s/%s", mypath, cp);
+		snprintf(nd = buf, sizeof(buf), "%s/%s", mypath, cp);
 	else
 		nd = cp;
 
@@ -104,12 +106,13 @@ context_read(void)
 			adios(nd, "error opening");
 		cp = concat("Your MH-directory \"", nd, "\" doesn't exist; Create it? ", NULL);
 		if (!getanswer(cp))
-			adios(NULL, "unable to access MH-directory \"%s\"", nd);
+			adios(NULL, "unable to access MH-directory \"%s\"",
+					nd);
 		free(cp);
 		if (!makedir(nd))
 			adios(NULL, "unable to create %s", nd);
 	} else if ((st.st_mode & S_IFDIR) == 0)
-		adios((char *)0, "`%s' is not a directory", nd);
+		adios(NULL, "`%s' is not a directory", nd);
 
 	/*
 	** Open and read user's context file.  The name of the context
@@ -117,7 +120,7 @@ context_read(void)
 	** environment variable.
 	*/
 
-	if ((cp = getenv("MHCONTEXT")) == (char *)0 || *cp == '\0')
+	if ((cp = getenv("MHCONTEXT")) == NULL || *cp == '\0')
 		cp = context;
 
 	/*
@@ -131,7 +134,7 @@ context_read(void)
 		return;
 	}
 
-	ctxpath = getcpy(m_maildir(cp));
+	ctxpath = getcpy(toabsdir(cp));
 
 	if ((ib = lkfopen(ctxpath, "r"))) {
 		readconfig((struct node **) 0, ib, cp, 1);