rmm: Use `refile -src' instead of a folder changing hack.

This is a cleanup for a ``hackish'' solution.
Thanks to Philipp Takacs <philipp@bureaucracy.de> for discovering this
improvement possibility and for preparing a patch.

diff --git a/uip/rmm.c b/uip/rmm.c
index 4b1d7d3..f602641 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -94,69 +94,50 @@ main(int argc, char **argv)
        if (!(mp = folder_read(folder))) {
                adios(NULL, "unable to read folder %s", folder);
        }
-
-       /* check for empty folder */
        if (mp->nummsg == 0) {
                adios(NULL, "no messages in %s", folder);
        }
-
-       /* parse all the message ranges/sequences and set SELECTED */
+       /*
+       ** parse all the message ranges/sequences and set SELECTED
+       ** (We do this for the refiling case as well, to complain
+       ** about invalid msg arguments in rmm, before we call refile.)
+       */
        for (msgnum = 0; msgnum < msgs.size; msgnum++) {
                if (!m_convert(mp, msgs.msgs[msgnum])) {
                        done(1);
                }
        }
-       seq_setprev(mp);  /* set the previous-sequence */
 
+       context_replace(curfolder, folder);
+       context_save();
 
        if (unlink_msgs) {
                /* "remove" the SELECTED messages */
                folder_delmsgs(mp, 1);
-
+               seq_setprev(mp);
                seq_save(mp);
-               context_replace(curfolder, folder);
-               context_save();
                folder_free(mp);
                done(0);
                return 1;
        }
 
-       /*
-       ** This is hackish.  If we don't unlink, but refile,
-       ** then we need to update the current folder in the
-       ** context so the external program will refile files
-       ** from the correct directory.
-       */
-       context_replace(curfolder, folder);
-       context_save();
-       fflush(stdout);
-
        /* remove by refiling. */
-       /* Unset the EXISTS flag for each message to be removed */
-       for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
-               if (is_selected(mp, msgnum)) {
-                       unset_exists(mp, msgnum);
-               }
-       }
 
-       /* Mark that the sequence information has changed */
-       mp->msgflags |= SEQMOD;
+       folder_free(mp);
+       fflush(stdout);
 
-       if (mp->numsel+4 > MAXARGS) {
+       if (msgs.size+6 > MAXARGS) {
                adios(NULL, "more than %d messages for refile exec",
-                               MAXARGS - 4);
+                               MAXARGS - 6);
        }
-       vec = (char **)mh_xmalloc((size_t)(mp->numsel + 4) * sizeof(*vec));
+       vec = (char **)mh_xmalloc((size_t)(msgs.size + 6) * sizeof(*vec));
        vec[vecp++] = "refile";
+       vec[vecp++] = "-src";
+       vec[vecp++] = concat("+", folder, NULL);
        vec[vecp++] = "-nolink";
        vec[vecp++] = concat("+", trashfolder, NULL);
-       for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
-               if (!is_selected(mp, msgnum)) {
-                       continue;
-               }
-               if (!(vec[vecp++] = strdup(m_name(msgnum)))) {
-                       adios(NULL, "strdup failed");
-               }
+       for (msgnum = 0; msgnum < msgs.size; msgnum++) {
+               vec[vecp++] = msgs.msgs[msgnum];
        }
        vec[vecp] = NULL;
 
@@ -175,7 +156,6 @@ main(int argc, char **argv)
                pidwait(pid, -1);
        }
 
-       folder_free(mp);
        done(0);
        return 1;
 }