make writeQuoted() work correctly with content containing NULs

[nmh] / uip / refile.c

diff --git a/uip/refile.c b/uip/refile.c
index 776c6fdfdf95c177473dc963a6a71b0f9eb8fcac..cbe61cdb5020140de5dda96a899a12784be39cf7 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -68,11 +68,7 @@ main (int argc, char **argv)
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
 
-    setlocale(LC_ALL, "");
-    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;
@@ -244,6 +240,14 @@ main (int argc, char **argv)
        && (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().
+     */
+
+    clsfolds (folders, foldp);
+
     /* If -nolink, then "remove" messages from source folder.
      *
      * Note that folder_delmsgs does not call the delete hook
@@ -256,8 +260,6 @@ main (int argc, char **argv)
        context_save ();                        /* save the context file   */
     }
 
-    clsfolds (folders, foldp);
-
     folder_free (mp);                  /* free folder structure   */
     done (0);
     return 1;
@@ -342,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");
     }
 }