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 ((pw = getpwuid(getuid())) == (struct passwd *)0 ||
+ *pw->pw_dir == '\0')
adios(NULL, "cannot determine your home directory");
else
mypath = pw->pw_dir;
*/
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((char *)0, "`%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((char *)0, "unable to read the `%s' profile specified by your MH environment variable", defpath);
} else {
defpath = concat(mypath, "/", mh_profile, NULL);
*/
if ((cp = context_find("path")) == (char *)0)
- adios(NULL, "Your %s file does not contain a path entry.", defpath);
+ 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);
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);
return;
}
- ctxpath = getcpy(m_maildir(cp));
+ ctxpath = getcpy(toabsdir(cp));
if ((ib = lkfopen(ctxpath, "r"))) {
readconfig((struct node **) 0, ib, cp, 1);