X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9cf9f118998a7635485e13863d1bc16c1486bb05..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/refile.c

diff --git a/uip/refile.c b/uip/refile.c
index 776c6fdf..ce56c51e 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -47,7 +47,7 @@ struct st_fold {
 /*
  * static prototypes
  */
-static void opnfolds (struct st_fold *, int);
+static void opnfolds (struct msgs *, struct st_fold *, int);
 static void clsfolds (struct st_fold *, int);
 static void remove_files (int, char **);
 static int m_file (struct msgs *, char *, int, struct st_fold *, int, int, int);
@@ -57,7 +57,7 @@ static void copy_seqs (struct msgs *, int, struct msgs *, int);
 int
 main (int argc, char **argv)
 {
-    int	linkf = 0, preserve = 0, retainseqs = 0, filep = 0;
+    int linkf = 0, preserve = 0, retainseqs = 0, filep = 0;
     int foldp = 0, isdf = 0, unlink_msgs = 0;
     int i, msgnum;
     char *cp, *folder = NULL, buf[BUFSIZ];
@@ -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;
@@ -177,7 +173,7 @@ main (int argc, char **argv)
     if (filep > 0) {
 	if (folder || msgs.size)
 	    adios (NULL, "use -file or some messages, not both");
-	opnfolds (folders, foldp);
+	opnfolds (NULL, folders, foldp);
 	for (i = 0; i < filep; i++)
 	    if (m_file (0, files[i], 0, folders, foldp, preserve, 0))
 		done (1);
@@ -211,7 +207,7 @@ main (int argc, char **argv)
     seq_setprev (mp);	/* set the previous-sequence */
 
     /* create folder structures for each destination folder */
-    opnfolds (folders, foldp);
+    opnfolds (mp, folders, foldp);
 
     /* Link all the selected messages into destination folders.
      *
@@ -221,7 +217,7 @@ main (int argc, char **argv)
      */
     for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
 	if (is_selected (mp, msgnum)) {
-	    cp = getcpy (m_name (msgnum));
+	    cp = mh_xstrdup(m_name (msgnum));
 	    if (m_file (mp, cp, retainseqs ? msgnum : 0, folders, foldp,
                         preserve, !linkf))
 		done (1);
@@ -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;
@@ -270,27 +272,41 @@ main (int argc, char **argv)
  */
 
 static void
-opnfolds (struct st_fold *folders, int nfolders)
+opnfolds (struct msgs *src_folder, struct st_fold *folders, int nfolders)
 {
     char nmaildir[BUFSIZ];
-    register struct st_fold *fp, *ep;
-    register struct msgs *mp;
+    struct st_fold *fp, *ep;
+    struct msgs *mp;
 
     for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
-	chdir (m_maildir (""));
+	if (chdir (m_maildir ("")) < 0) {
+	    advise (m_maildir (""), "chdir");
+	}
 	strncpy (nmaildir, m_maildir (fp->f_name), sizeof(nmaildir));
 
-    create_folder (nmaildir, 0, done);
-
-	if (chdir (nmaildir) == NOTOK)
-	    adios (nmaildir, "unable to change directory to");
-	if (!(mp = folder_read (fp->f_name, 1)))
-	    adios (NULL, "unable to read folder %s", fp->f_name);
-	mp->curmsg = 0;
-
-	fp->f_mp = mp;
+	/*
+	 * Null src_folder indicates that we are refiling a file to
+	 * the folders, in which case we don't want to short-circuit
+	 * fp->f_mp to any "source folder".
+	 */
+	if (! src_folder  ||  strcmp (src_folder->foldpath, nmaildir)) {
+	    create_folder (nmaildir, 0, done);
+
+	    if (chdir (nmaildir) == NOTOK)
+		adios (nmaildir, "unable to change directory to");
+	    if (!(mp = folder_read (fp->f_name, 1)))
+		adios (NULL, "unable to read folder %s", fp->f_name);
+	    mp->curmsg = 0;
+
+	    fp->f_mp = mp;
+	} else {
+	    /* Source and destination folders are the same. */
+	    fp->f_mp = src_folder;
+	}
 
-	chdir (maildir);
+	if (maildir[0] != '\0'  &&  chdir (maildir) < 0) {
+	    advise (maildir, "chdir");
+	}
     }
 }
 
@@ -303,8 +319,8 @@ opnfolds (struct st_fold *folders, int nfolders)
 static void
 clsfolds (struct st_fold *folders, int nfolders)
 {
-    register struct st_fold *fp, *ep;
-    register struct msgs *mp;
+    struct st_fold *fp, *ep;
+    struct msgs *mp;
 
     for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
 	mp = fp->f_mp;
@@ -342,7 +358,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");
     }
 }
@@ -361,7 +377,16 @@ m_file (struct msgs *mp, char *msgfile, int oldmsgnum,
     struct st_fold *fp, *ep;
 
     for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
-	if ((msgnum = folder_addmsg (&fp->f_mp, msgfile, 1, 0, preserve, nfolders == 1 && refile, maildir)) == -1)
+	/*
+	 * With same source and destination folder, don't indicate that
+	 * the new message is selected so that 1) folder_delmsgs() doesn't
+	 * delete it later and 2) it is not reflected in mp->hghsel, and
+	 * therefore won't be assigned to be the current message.
+	 */
+	if ((msgnum = folder_addmsg (&fp->f_mp, msgfile,
+				     mp == fp->f_mp ? 0 : 1,
+				     0, preserve, nfolders == 1 && refile,
+				     maildir)) == -1)
 	    return 1;
 	if (oldmsgnum) copy_seqs (mp, oldmsgnum, fp->f_mp, msgnum);
     }