X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/177f020f122827214159c46dcfe7ded1e3c8d1c3..ec173fd2c:/uip/rmm.c?ds=sidebyside

diff --git a/uip/rmm.c b/uip/rmm.c
index 03e0e6cb..df28926f 100644
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -5,8 +5,25 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/smatch.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.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) \
@@ -28,14 +45,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;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -48,7 +66,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]",
@@ -60,15 +78,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;
@@ -77,11 +95,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"))
@@ -97,11 +114,11 @@ main (int argc, char **argv)
 
     /* read folder and create message structure */
     if (!(mp = folder_read (folder, 1)))
-	adios (NULL, "unable to read folder %s", folder);
+	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++)