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

[mmh] / uip / refile.c

diff --git a/uip/refile.c b/uip/refile.c
index b24e42e..34e55ce 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -73,7 +73,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();
@@ -128,10 +128,7 @@ main(int argc, char **argv)
                                if (!(cp = *argp++) || *cp == '-')
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);
-                               folder = path(*cp == '+' || *cp == '@' ?
-                                               cp + 1 : cp,
-                                               *cp != '@' ?
-                                               TFOLDER : TSUBCWF);
+                               folder = pluspath(cp);
                                continue;
                        case FILESW:
                                if (filep > NFOLDERS)
@@ -192,7 +189,7 @@ main(int argc, char **argv)
        if (!msgs.size)
                app_msgarg(&msgs, "cur");
        if (!folder)
-               folder = getfolder(1);
+               folder = getfolder(FCUR);
        strncpy(maildir, m_maildir(folder), sizeof(maildir));
 
        if (chdir(maildir) == NOTOK)
@@ -335,7 +332,7 @@ remove_files(int filep, char **files)
                files[filep] = NULL;  /* NULL terminate list */
 
                fflush(stdout);
-               vec[0] = r1bindex(rmmproc, '/');
+               vec[0] = mhbasename(rmmproc);
                execvp(rmmproc, vec);
                adios(rmmproc, "unable to exec");
        }