s/pfolder/curfolder/g

[mmh] / uip / install-mh.c

diff --git a/uip/install-mh.c b/uip/install-mh.c
index 50854f0..30ac8f6 100644 (file)
--- 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();
 
        /*