Improved pluspath() and used it instead of path() where appropriate.

[mmh] / uip / repl.c

diff --git a/uip/repl.c b/uip/repl.c
index 6893f56..8d10e5d 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -121,7 +121,7 @@ main(int argc, char **argv)
 #ifdef LOCALE
        setlocale(LC_ALL, "");
 #endif
-       invo_name = r1bindex(argv[0], '/');
+       invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
        context_read();
@@ -199,8 +199,7 @@ main(int argc, char **argv)
                                                adios(NULL, "missing argument to %s", argp[-2]);
                                        dp = NULL;
                                        if (*cp == '@')
-                                               cp = dp = path(cp + 1,
-                                                               TSUBCWF);
+                                               cp = dp = pluspath(cp);
                                        if (fcc)
                                                fcc = add(", ", fcc);
                                        fcc = add(cp, fcc);
@@ -310,7 +309,7 @@ main(int argc, char **argv)
                if (!msg)
                        msg = "cur";
                if (!folder)
-                       folder = getfolder(1);
+                       folder = getfolder(FCUR);
                maildir = m_maildir(folder);
 
                if (chdir(maildir) == NOTOK)