X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8cebca1119664be52f1cbccd0ee052ae0b8c1de0..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/refile.c diff --git a/uip/refile.c b/uip/refile.c index ecbe3466..bed5cba6 100644 --- a/uip/refile.c +++ b/uip/refile.c @@ -1,6 +1,4 @@ - -/* - * refile.c -- move or link message(s) from a source folder +/* refile.c -- move or link message(s) from a source folder * -- into one or more destination folders * * This code is Copyright (c) 2002, by the authors of nmh. See the @@ -10,6 +8,8 @@ #include #include +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" #include #define REFILE_SWITCHES \ @@ -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]; @@ -173,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); @@ -207,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. * @@ -217,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); @@ -240,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 @@ -252,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; @@ -266,41 +272,55 @@ 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"); + } } } /* - * Set the Previous-Sequence and then sychronize the + * Set the Previous-Sequence and then synchronize the * sequence file, for each destination folder. */ 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; @@ -357,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, preserve, nfolders == 1 && refile, + maildir)) == -1) return 1; if (oldmsgnum) copy_seqs (mp, oldmsgnum, fp->f_mp, msgnum); } @@ -382,7 +411,7 @@ copy_seqs (struct msgs *oldmp, int oldmsgnum, struct msgs *newmp, int newmsgnum) 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); + !is_seq_private (oldmp, seqnum), 0); } } }