Introduced FDEF and FCUR for speaking arguments to getfolder().

[mmh] / uip / rmf.c

diff --git a/uip/rmf.c b/uip/rmf.c
index fff4abb..94198d0 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -37,7 +37,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();
@@ -84,7 +84,7 @@ main(int argc, char **argv)
        if (!context_find("path"))
                free(path("./", TFOLDER));
        if (!folder) {
-               folder = getfolder(1);
+               folder = getfolder(FCUR);
                defolder++;
        }
        if (strcmp(m_mailpath(folder), pwd()) == 0)
@@ -100,9 +100,9 @@ main(int argc, char **argv)
                if (cp > newfolder)
                        *cp = '\0';
                else
-                       strncpy(newfolder, getfolder(0), sizeof(newfolder));
+                       strncpy(newfolder, getfolder(FDEF), sizeof(newfolder));
        } else {
-               strncpy(newfolder, getfolder(0), sizeof(newfolder));
+               strncpy(newfolder, getfolder(FDEF), sizeof(newfolder));
        }
 
        if (interactive) {