s/pfolder/curfolder/g

[mmh] / uip / rmm.c

diff --git a/uip/rmm.c b/uip/rmm.c
index 7f77340..c1b1608 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -73,18 +73,16 @@ main(int argc, char **argv)
                        if (folder)
                                adios(NULL, "only one folder at a time!");
                        else
-                               folder = pluspath(cp);
+                               folder = getcpy(expandfol(cp));
                } else
                        app_msgarg(&msgs, cp);
        }
 
-       if (!context_find("path"))
-               free(path("./", TFOLDER));
        if (!msgs.size)
                app_msgarg(&msgs, "cur");
        if (!folder)
-               folder = getfolder(1);
-       maildir = m_maildir(folder);
+               folder = getcurfol();
+       maildir = toabsdir(folder);
 
        if (chdir(maildir) == NOTOK)
                adios(maildir, "unable to change directory to");
@@ -111,7 +109,7 @@ main(int argc, char **argv)
        ** folder_delmsgs().
        */
        if (rmmproc) {
-               context_replace(pfolder, folder);
+               context_replace(curfolder, folder);
                context_save();
                fflush(stdout);
        }
@@ -120,7 +118,7 @@ main(int argc, char **argv)
        folder_delmsgs(mp, unlink_msgs, 0);
 
        seq_save(mp);  /* synchronize message sequences  */
-       context_replace(pfolder, folder);  /* update current folder   */
+       context_replace(curfolder, folder);  /* update current folder   */
        context_save();  /* save the context file   */
        folder_free(mp);  /* free folder structure   */
        done(0);