Updated MACHINES to show package requirements on Linux and Cygwin.

[nmh] / uip / rmm.c

diff --git a/uip/rmm.c b/uip/rmm.c
index 02a55910ba1a95e15034ad80f8b76e7ea3b75554..ee602b45bc67c09bf1f51a0a261f1809b2e85701 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -13,6 +13,8 @@
 #define RMM_SWITCHES \
     X("unlink", 0, UNLINKSW) \
     X("nounlink", 0, NUNLINKSW) \
+    X("rmmproc program", 0, RPROCSW) \
+    X("normmproc", 0, NRPRCSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
 
@@ -50,13 +52,13 @@ main (int argc, char **argv)
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
-           case AMBIGSW: 
+           case AMBIGSW:
                ambigsw (cp, switches);
                done (1);
-           case UNKWNSW: 
+           case UNKWNSW:
                adios (NULL, "-%s unknown\n", cp);
 
-           case HELPSW: 
+           case HELPSW:
                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                          invo_name);
                print_help (buf, switches, 1);
@@ -71,6 +73,14 @@ main (int argc, char **argv)
            case NUNLINKSW:
                unlink_msgs = 0;
                continue;
+
+            case RPROCSW:
+                if (!(rmmproc = *argp++) || *rmmproc == '-')
+                    adios (NULL, "missing argument to %s", argp[-2]);
+                continue;
+            case NRPRCSW:
+                rmmproc = NULL;
+                continue;
            }
        }
        if (*cp == '+' || *cp == '@') {
@@ -108,24 +118,16 @@ main (int argc, char **argv)
     seq_setprev (mp);          /* set the previous-sequence      */
 
     /*
-     * This is hackish.  If we are using a external rmmproc,
-     * then we need to update the current folder in the
-     * context so the external rmmproc will remove files
-     * from the correct directory.  This should be moved to
-     * folder_delmsgs().
+     * As part of the new world locking order, folder_delmsgs() now updates
+     * the sequence and context for us.  But since folder_delmsgs() doesn't
+     * have access to the folder name, change the context now.
      */
-    if (rmmproc) {
-       context_replace (pfolder, folder);
-       context_save ();
-       fflush (stdout);
-    }
+
+    context_replace (pfolder, folder);
 
     /* "remove" the SELECTED messages */
     folder_delmsgs (mp, unlink_msgs, 0);
 
-    seq_save (mp);             /* synchronize message sequences  */
-    context_replace (pfolder, folder); /* update current folder   */
-    context_save ();                   /* save the context file   */
     folder_free (mp);                  /* free folder structure   */
     done (0);
     return 1;