make writeQuoted() work correctly with content containing NULs

[nmh] / uip / refile.c

diff --git a/uip/refile.c b/uip/refile.c
index 1d44b362d21aa4b4dfec53660318b2b090774c9b..cbe61cdb5020140de5dda96a899a12784be39cf7 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -11,8 +11,6 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <fcntl.h>
-#include <errno.h>
-#include <assert.h>
 
 #define REFILE_SWITCHES \
     X("draft", 0, DRAFTSW) \
@@ -70,13 +68,7 @@ main (int argc, char **argv)
     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], 1)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -175,11 +167,6 @@ main (int argc, char **argv)
     if (foldp == 0)
        adios (NULL, "no folder specified");
 
-#ifdef WHATNOW
-    if (!msgs.size && !foldp && !filep && (cp = getenv ("mhdraft")) && *cp)
-       files[filep++] = cp;
-#endif /* WHATNOW */
-
     /*
      * We are refiling a file to the folders
      */
@@ -206,7 +193,7 @@ main (int argc, char **argv)
        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 */
@@ -239,16 +226,27 @@ main (int argc, char **argv)
     }
 
     /*
-     * This is a hack.  If we are using an external rmmproc,
-     * then save the current folder to the context file,
-     * so the external rmmproc will remove files from the correct
-     * directory.  This should be moved to folder_delmsgs().
+     * Update this now, since folder_delmsgs() will save the context
+     * but doesn't have access to the folder name.
+     */
+
+    context_replace (pfolder, folder); /* update current folder   */
+
+    /*
+     * Adjust "cur" if necessary
+     */
+
+    if (mp->hghsel != mp->curmsg
+       && (mp->numsel != mp->nummsg || linkf))
+       seq_setcur (mp, mp->hghsel);
+
+    /*
+     * Close destination folders now; if we are using private sequences
+     * we need to have all of our calls to seq_save() complete before we
+     * call context_save().
      */
-    if (rmmproc) {
-       context_replace (pfolder, folder);
-       context_save ();
-       fflush (stdout);
-    }
+
+    clsfolds (folders, foldp);
 
     /* If -nolink, then "remove" messages from source folder.
      *
@@ -257,17 +255,11 @@ main (int argc, char **argv)
      */
     if (!linkf) {
        folder_delmsgs (mp, unlink_msgs, 1);
+    } else {
+       seq_save (mp);  /* synchronize message sequences */
+       context_save ();                        /* save the context file   */
     }
 
-    clsfolds (folders, foldp);
-
-    if (mp->hghsel != mp->curmsg
-       && (mp->numsel != mp->nummsg || linkf))
-       seq_setcur (mp, mp->hghsel);
-    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;
@@ -294,7 +286,7 @@ opnfolds (struct st_fold *folders, int nfolders)
 
        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;
 
@@ -352,7 +344,7 @@ remove_files (int filep, char **files)
     /* Else just unlink the files */
     files++;   /* advance past filevec[0] */
     for (i = 0; i < filep; i++) {
-       if (unlink (files[i]) == NOTOK)
+       if (m_unlink (files[i]) == NOTOK)
            admonish (files[i], "unable to unlink");
     }
 }
@@ -387,11 +379,13 @@ static void
 copy_seqs (struct msgs *oldmp, int oldmsgnum, struct msgs *newmp, int newmsgnum)
 {
     char **seq;
-    int seqnum;
+    size_t seqnum;
 
-    for (seq = oldmp->msgattrs, seqnum = 0; *seq; ++seq, ++seqnum) {
+    for (seq = svector_strs (oldmp->msgattrs), seqnum = 0;
+        *seq && seqnum < svector_size (oldmp->msgattrs);
+        ++seq, ++seqnum) {
        if (strcmp (current, *seq)) {
-           assert (seqnum == seq_getnum (oldmp, *seq));
+           assert ((int) seqnum == seq_getnum (oldmp, *seq));
            if (in_sequence (oldmp, seqnum, oldmsgnum)) {
                seq_addmsg (newmp, *seq, newmsgnum,
                            is_seq_private (oldmp, seqnum) ? 0 : 1, 0);