X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ebd71fa45bb0538e65e3106de57a04ae6c70abae..0b7286788a95dd854d1826b8493eda431d8e8aac:/uip/rmm.c

diff --git a/uip/rmm.c b/uip/rmm.c
index 897c5028..38090baa 100644
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -1,14 +1,24 @@
-
-/*
- * rmm.c -- remove a message(s)
+/* rmm.c -- remove a message(s)
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "sbr/folder_read.h"
+#include "sbr/folder_free.h"
+#include "sbr/folder_delmsgs.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/m_maildir.h"
 
 #define RMM_SWITCHES \
     X("unlink", 0, UNLINKSW) \
@@ -30,20 +40,15 @@ DEFINE_SWITCH_ARRAY(RMM, switches);
 int
 main (int argc, char **argv)
 {
-    int msgnum, unlink_msgs = 0;
+    int msgnum;
+    bool unlink_msgs = false;
     char *cp, *maildir, *folder = NULL;
     char buf[BUFSIZ], **argp;
     char **arguments;
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -56,7 +61,7 @@ main (int argc, char **argv)
 		ambigsw (cp, switches);
 		done (1);
 	    case UNKWNSW:
-		adios (NULL, "-%s unknown\n", cp);
+		die("-%s unknown\n", cp);
 
 	    case HELPSW:
 		snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
@@ -68,15 +73,15 @@ main (int argc, char **argv)
 		done (0);
 
 	    case UNLINKSW:
-		unlink_msgs++;
+		unlink_msgs = true;
 		continue;
 	    case NUNLINKSW:
-		unlink_msgs = 0;
+		unlink_msgs = false;
 		continue;
 
             case RPROCSW:
                 if (!(rmmproc = *argp++) || *rmmproc == '-')
-                    adios (NULL, "missing argument to %s", argp[-2]);
+                    die("missing argument to %s", argp[-2]);
                 continue;
             case NRPRCSW:
                 rmmproc = NULL;
@@ -85,11 +90,10 @@ main (int argc, char **argv)
 	}
 	if (*cp == '+' || *cp == '@') {
 	    if (folder)
-		adios (NULL, "only one folder at a time!");
-	    else
-		folder = pluspath (cp);
+		die("only one folder at a time!");
+            folder = pluspath (cp);
 	} else
-		app_msgarg(&msgs, cp);
+            app_msgarg(&msgs, cp);
     }
 
     if (!context_find ("path"))
@@ -104,12 +108,12 @@ main (int argc, char **argv)
 	adios (maildir, "unable to change directory to");
 
     /* read folder and create message structure */
-    if (!(mp = folder_read (folder)))
-	adios (NULL, "unable to read folder %s", folder);
+    if (!(mp = folder_read (folder, 1)))
+	die("unable to read folder %s", folder);
 
     /* check for empty folder */
     if (mp->nummsg == 0)
-	adios (NULL, "no messages in %s", folder);
+	die("no messages in %s", folder);
 
     /* parse all the message ranges/sequences and set SELECTED */
     for (msgnum = 0; msgnum < msgs.size; msgnum++)
@@ -118,24 +122,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;