Support for sequence file locking in inc(1).

[nmh] / uip / refile.c

diff --git a/uip/refile.c b/uip/refile.c
index 4d9129155e95c818880d51fed8f741990d60310b..8dd04fb92a46355de6c6ae280f243f9d03eaf31f 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -3,8 +3,6 @@
  * refile.c -- move or link message(s) from a source folder
  *          -- into one or more destination folders
  *
  * refile.c -- move or link message(s) from a source folder
  *          -- into one or more destination folders
  *

- * $Id$
- *

  * 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.


@@ -15,42 +13,28 @@
 #include <fcntl.h>
 #include <errno.h>
 
 #include <fcntl.h>
 #include <errno.h>
 

-/*
- * We allocate spaces for messages (msgs array)
- * this number of elements at a time.
- */
-#define MAXMSGS  256
-
-
-static struct swit switches[] = {
-#define        DRAFTSW          0
-    { "draft", 0 },
-#define        LINKSW           1
-    { "link", 0 },
-#define        NLINKSW          2
-    { "nolink", 0 },
-#define        PRESSW           3
-    { "preserve", 0 },
-#define        NPRESSW          4
-    { "nopreserve", 0 },
-#define UNLINKSW         5
-    { "unlink", 0 },
-#define NUNLINKSW        6
-    { "nounlink", 0 },
-#define        SRCSW            7
-    { "src +folder", 0 },
-#define        FILESW           8
-    { "file file", 0 },
-#define        RPROCSW          9
-    { "rmmproc program", 0 },
-#define        NRPRCSW         10
-    { "normmproc", 0 },
-#define VERSIONSW       11
-    { "version", 0 },
-#define        HELPSW          12
-    { "help", 0 },
-    { NULL, 0 }
-};
+#define REFILE_SWITCHES \
+    X("draft", 0, DRAFTSW) \
+    X("link", 0, LINKSW) \
+    X("nolink", 0, NLINKSW) \
+    X("preserve", 0, PRESSW) \
+    X("nopreserve", 0, NPRESSW) \
+    X("unlink", 0, UNLINKSW) \
+    X("nounlink", 0, NUNLINKSW) \
+    X("src +folder", 0, SRCSW) \
+    X("file file", 0, FILESW) \
+    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(REFILE);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(REFILE, switches);
+#undef X

 
 static char maildir[BUFSIZ];
 
 
 static char maildir[BUFSIZ];
 


@@ -73,12 +57,13 @@ main (int argc, char **argv)
 {
     int        linkf = 0, preserve = 0, filep = 0;
     int foldp = 0, isdf = 0, unlink_msgs = 0;
 {
     int        linkf = 0, preserve = 0, filep = 0;
     int foldp = 0, isdf = 0, unlink_msgs = 0;

-    int i, msgnum, nummsgs, maxmsgs;
+    int i, msgnum;

     char *cp, *folder = NULL, buf[BUFSIZ];
     char *cp, *folder = NULL, buf[BUFSIZ];

-    char **argp, **arguments, **msgs;
+    char **argp, **arguments;

     char *filevec[NFOLDERS + 2];
     char **files = &filevec[1];           /* leave room for remove_files:vec[0] */
     struct st_fold folders[NFOLDERS + 1];
     char *filevec[NFOLDERS + 2];
     char **files = &filevec[1];           /* leave room for remove_files:vec[0] */
     struct st_fold folders[NFOLDERS + 1];

+    struct msgs_array msgs = { 0, 0, NULL };

     struct msgs *mp;
 
 #ifdef LOCALE
     struct msgs *mp;
 
 #ifdef LOCALE


@@ -92,14 +77,6 @@ main (int argc, char **argv)
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 

-    /*
-     * Allocate the initial space to record message
-     * names, ranges, and sequences.
-     */
-    nummsgs = 0;
-    maxmsgs = MAXMSGS;
-    msgs = (char **) mh_xmalloc ((size_t) (maxmsgs * sizeof(*msgs)));
-

     /*
      * Parse arguments
      */
     /*
      * Parse arguments
      */


@@ -116,10 +93,10 @@ main (int argc, char **argv)
                snprintf (buf, sizeof(buf), "%s [msgs] [switches] +folder ...",
                          invo_name);
                print_help (buf, switches, 1);
                snprintf (buf, sizeof(buf), "%s [msgs] [switches] +folder ...",
                          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 LINKSW: 
                linkf++;
 
            case LINKSW: 
                linkf++;


@@ -177,20 +154,9 @@ main (int argc, char **argv)
            if (foldp > NFOLDERS)
                adios (NULL, "only %d folders allowed!", NFOLDERS);
            folders[foldp++].f_name =
            if (foldp > NFOLDERS)
                adios (NULL, "only %d folders allowed!", NFOLDERS);
            folders[foldp++].f_name =

-               path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
-       } else {
-           /*
-            * Check if we need to allocate more space
-            * for message names, ranges, and sequences.
-            */
-           if (nummsgs >= maxmsgs) {
-               maxmsgs += MAXMSGS;
-               if (!(msgs = (char **) realloc (msgs,
-                                               (size_t) (maxmsgs * sizeof(*msgs)))))
-                   adios (NULL, "unable to reallocate msgs storage");
-           }
-           msgs[nummsgs++] = cp;
-       }
+               pluspath (cp);
+       } else
+               app_msgarg(&msgs, cp);

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


@@ -199,7 +165,7 @@ main (int argc, char **argv)
        adios (NULL, "no folder specified");
 
 #ifdef WHATNOW
        adios (NULL, "no folder specified");
 
 #ifdef WHATNOW

-    if (!nummsgs && !foldp && !filep && (cp = getenv ("mhdraft")) && *cp)
+    if (!msgs.size && !foldp && !filep && (cp = getenv ("mhdraft")) && *cp)

        files[filep++] = cp;
 #endif /* WHATNOW */
 
        files[filep++] = cp;
 #endif /* WHATNOW */
 


@@ -207,7 +173,7 @@ main (int argc, char **argv)
      * We are refiling a file to the folders
      */
     if (filep > 0) {
      * We are refiling a file to the folders
      */
     if (filep > 0) {

-       if (folder || nummsgs)
+       if (folder || msgs.size)

            adios (NULL, "use -file or some messages, not both");
        opnfolds (folders, foldp);
        for (i = 0; i < filep; i++)
            adios (NULL, "use -file or some messages, not both");
        opnfolds (folders, foldp);
        for (i = 0; i < filep; i++)


@@ -219,8 +185,8 @@ main (int argc, char **argv)
        done (0);
     }
 
        done (0);
     }
 

-    if (!nummsgs)
-       msgs[nummsgs++] = "cur";
+    if (!msgs.size)
+       app_msgarg(&msgs, "cur");

     if (!folder)
        folder = getfolder (1);
     strncpy (maildir, m_maildir (folder), sizeof(maildir));
     if (!folder)
        folder = getfolder (1);
     strncpy (maildir, m_maildir (folder), sizeof(maildir));


@@ -229,7 +195,7 @@ main (int argc, char **argv)
        adios (maildir, "unable to change directory to");
 
     /* read source folder and create message structure */
        adios (maildir, "unable to change directory to");
 
     /* read source folder and create message structure */

-    if (!(mp = folder_read (folder)))
+    if (!(mp = folder_read (folder, 1)))

        adios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */
        adios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */


@@ -237,8 +203,8 @@ main (int argc, char **argv)
        adios (NULL, "no messages in %s", folder);
 
     /* parse the message range/sequence/name and set SELECTED */
        adios (NULL, "no messages in %s", folder);
 
     /* parse the message range/sequence/name and set SELECTED */

-    for (msgnum = 0; msgnum < nummsgs; msgnum++)
-       if (!m_convert (mp, msgs[msgnum]))
+    for (msgnum = 0; msgnum < msgs.size; msgnum++)
+       if (!m_convert (mp, msgs.msgs[msgnum]))

            done (1);
     seq_setprev (mp);  /* set the previous-sequence */
 
            done (1);
     seq_setprev (mp);  /* set the previous-sequence */
 


@@ -291,7 +257,8 @@ main (int argc, char **argv)
     context_replace (pfolder, folder); /* update current folder   */
     context_save ();                   /* save the context file   */
     folder_free (mp);                  /* free folder structure   */
     context_replace (pfolder, folder); /* update current folder   */
     context_save ();                   /* save the context file   */
     folder_free (mp);                  /* free folder structure   */

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

 }
 
 
 }
 
 


@@ -303,30 +270,19 @@ main (int argc, char **argv)
 static void
 opnfolds (struct st_fold *folders, int nfolders)
 {
 static void
 opnfolds (struct st_fold *folders, int nfolders)
 {

-    register char *cp;

     char nmaildir[BUFSIZ];
     register struct st_fold *fp, *ep;
     register struct msgs *mp;
     char nmaildir[BUFSIZ];
     register struct st_fold *fp, *ep;
     register struct msgs *mp;

-    struct stat st;

 
     for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
        chdir (m_maildir (""));
        strncpy (nmaildir, m_maildir (fp->f_name), sizeof(nmaildir));
 
 
     for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
        chdir (m_maildir (""));
        strncpy (nmaildir, m_maildir (fp->f_name), sizeof(nmaildir));
 

-       if (stat (nmaildir, &st) == NOTOK) {
-           if (errno != ENOENT)
-               adios (nmaildir, "error on folder");
-           cp = concat ("Create folder \"", nmaildir, "\"? ", NULL);
-           if (!getanswer (cp))
-               done (1);
-           free (cp);
-           if (!makedir (nmaildir))
-               adios (NULL, "unable to create folder %s", nmaildir);
-       }
+    create_folder (nmaildir, 0, done);

 
        if (chdir (nmaildir) == NOTOK)
            adios (nmaildir, "unable to change directory to");
 
        if (chdir (nmaildir) == NOTOK)
            adios (nmaildir, "unable to change directory to");

-       if (!(mp = folder_read (fp->f_name)))
+       if (!(mp = folder_read (fp->f_name, 1)))

            adios (NULL, "unable to read folder %s", fp->f_name);
        mp->curmsg = 0;
 
            adios (NULL, "unable to read folder %s", fp->f_name);
        mp->curmsg = 0;
 


@@ -365,17 +321,19 @@ clsfolds (struct st_fold *folders, int nfolders)
 static void
 remove_files (int filep, char **files)
 {
 static void
 remove_files (int filep, char **files)
 {

-    int i;
-    char **vec;
+    int i, vecp;
+    char **vec, *program;

 
     /* If rmmproc is defined, we use that */
     if (rmmproc) {
 
     /* If rmmproc is defined, we use that */
     if (rmmproc) {

-       vec = files++;          /* vec[0] = filevec[0] */
-       files[filep] = NULL;    /* NULL terminate list */
+       vec = argsplit(rmmproc, &program, &vecp);
+       files++;                /* Yes, we need to do this */
+       for (i = 0; i < filep; i++)
+               vec[vecp++] = files[i];
+       vec[vecp] = NULL;       /* NULL terminate list */

 
        fflush (stdout);
 
        fflush (stdout);

-       vec[0] = r1bindex (rmmproc, '/');
-       execvp (rmmproc, vec);
+       execvp (program, vec);

        adios (rmmproc, "unable to exec");
     }
 
        adios (rmmproc, "unable to exec");
     }