X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/71e45cde42e178b7eed46fbe9c86f8c1c56f50d3..d6b2ae5fa68b9a82ffc006c233aef64c5cdb3bd2:/uip/refile.c diff --git a/uip/refile.c b/uip/refile.c index 1d44b362..5d03d4d1 100644 --- a/uip/refile.c +++ b/uip/refile.c @@ -11,8 +11,6 @@ #include #include #include -#include -#include #define REFILE_SWITCHES \ X("draft", 0, DRAFTSW) \ @@ -49,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); @@ -59,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]; @@ -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,18 +167,13 @@ 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 */ 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); @@ -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 */ @@ -220,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. * @@ -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. */ - if (rmmproc) { - context_replace (pfolder, folder); - context_save (); - fflush (stdout); - } + + 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(). + */ + + 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; @@ -280,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; 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))) - 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"); + } } } @@ -352,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"); } } @@ -371,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); } @@ -387,11 +402,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);