seq_del.c: Move interface to own file.

[nmh] / uip / rmm.c

diff --git a/uip/rmm.c b/uip/rmm.c
index 7680008d196ca4b24c1764ac4a8f999c14e811a5..40bb97daeb9ee8b91444198897b5139fe528811f 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -1,45 +1,45 @@
-
-/*
- * 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.
  */
 
  *
  * 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/error.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/m_maildir.h"
+
+#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) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(RMM);
+#undef X

 
 

-static struct swit switches[] = {
-#define UNLINKSW      0
-    { "unlink", 0 },
-#define NUNLINKSW    1
-    { "nounlink", 0 },
-#define VERSIONSW     2
-    { "version", 0 },
-#define        HELPSW        3
-    { "help", 0 },
-    { NULL, 0 }
-};
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(RMM, switches);
+#undef X

 
 
 int
 main (int argc, char **argv)
 {
 
 
 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;
 
     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;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -48,36 +48,43 @@ main (int argc, char **argv)
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {

-           case AMBIGSW: 
+           case AMBIGSW:

                ambigsw (cp, switches);
                done (1);
                ambigsw (cp, switches);
                done (1);

-           case UNKWNSW: 
-               adios (NULL, "-%s unknown\n", cp);
+           case UNKWNSW:
+               die("-%s unknown\n", cp);

 
 

-           case HELPSW: 
+           case HELPSW:

                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                          invo_name);
                print_help (buf, switches, 1);
                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                          invo_name);
                print_help (buf, switches, 1);

-               done (1);
+               done (0);

            case VERSIONSW:
                print_version(invo_name);
            case VERSIONSW:
                print_version(invo_name);

-               done (1);
+               done (0);

 
            case UNLINKSW:
 
            case UNLINKSW:

-               unlink_msgs++;
+               unlink_msgs = true;

                continue;
            case NUNLINKSW:
                continue;
            case NUNLINKSW:

-               unlink_msgs = 0;
+               unlink_msgs = false;

                continue;
                continue;

+
+            case RPROCSW:
+                if (!(rmmproc = *argp++) || *rmmproc == '-')
+                    die("missing argument to %s", argp[-2]);
+                continue;
+            case NRPRCSW:
+                rmmproc = NULL;
+                continue;

            }
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
            }
        }
        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
        } else

-               app_msgarg(&msgs, cp);
+            app_msgarg(&msgs, cp);

     }
 
     if (!context_find ("path"))
     }
 
     if (!context_find ("path"))


@@ -92,12 +99,12 @@ main (int argc, char **argv)
        adios (maildir, "unable to change directory to");
 
     /* read folder and create message structure */
        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)
 
     /* 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++)
 
     /* parse all the message ranges/sequences and set SELECTED */
     for (msgnum = 0; msgnum < msgs.size; msgnum++)


@@ -106,24 +113,16 @@ main (int argc, char **argv)
     seq_setprev (mp);          /* set the previous-sequence      */
 
     /*
     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);
 
 
     /* "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;
     folder_free (mp);                  /* free folder structure   */
     done (0);
     return 1;