X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5dd6771b28c257af405d7248639ed0e3bcdce38b..9291a5f82480f2458e04cb9ea7e6749bc952b308:/uip/refile.c diff --git a/uip/refile.c b/uip/refile.c index 25f76299..eb63c9a5 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 @@ -8,40 +6,55 @@ * complete copyright information. */ -#include -#include +#include "h/mh.h" +#include "sbr/m_draft.h" +#include "sbr/m_convert.h" +#include "sbr/getfolder.h" +#include "sbr/folder_read.h" +#include "sbr/folder_free.h" +#include "sbr/folder_delmsgs.h" +#include "sbr/folder_addmsg.h" +#include "sbr/context_save.h" +#include "sbr/context_replace.h" +#include "sbr/context_find.h" +#include "sbr/ambigsw.h" +#include "sbr/path.h" +#include "sbr/print_version.h" +#include "sbr/print_help.h" +#include "sbr/seq_getnum.h" +#include "sbr/seq_add.h" +#include "sbr/arglist.h" +#include "sbr/error.h" +#include "h/done.h" +#include "h/utils.h" +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" #include -#include - -static struct swit switches[] = { -#define DRAFTSW 0 - { "draft", 0 }, -#define LINKSW 1 - { "link", 0 }, -#define NLINKSW 2 - { "nolink", 0 }, -#define PRESSW 3 - { "preserve", 0 }, -#define NPRESSW 4 - { "nopreserve", 0 }, -#define UNLINKSW 5 - { "unlink", 0 }, -#define NUNLINKSW 6 - { "nounlink", 0 }, -#define SRCSW 7 - { "src +folder", 0 }, -#define FILESW 8 - { "file file", 0 }, -#define RPROCSW 9 - { "rmmproc program", 0 }, -#define NRPRCSW 10 - { "normmproc", 0 }, -#define VERSIONSW 11 - { "version", 0 }, -#define HELPSW 12 - { "help", 0 }, - { NULL, 0 } -}; + +#define REFILE_SWITCHES \ + X("draft", 0, DRAFTSW) \ + X("link", 0, LINKSW) \ + X("nolink", 0, NLINKSW) \ + X("preserve", 0, PRESSW) \ + X("nopreserve", 0, NPRESSW) \ + X("retainsequences", 0, RETAINSEQSSW) \ + X("noretainsequences", 0, NRETAINSEQSSW) \ + X("unlink", 0, UNLINKSW) \ + X("nounlink", 0, NUNLINKSW) \ + X("src +folder", 0, SRCSW) \ + X("file file", 0, FILESW) \ + X("rmmproc program", 0, RPROCSW) \ + X("normmproc", 0, NRPRCSW) \ + X("version", 0, VERSIONSW) \ + X("help", 0, HELPSW) \ + +#define X(sw, minchars, id) id, +DEFINE_SWITCH_ENUM(REFILE); +#undef X + +#define X(sw, minchars, id) { sw, minchars, id }, +DEFINE_SWITCH_ARRAY(REFILE, switches); +#undef X static char maildir[BUFSIZ]; @@ -53,17 +66,22 @@ 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 (char *, struct st_fold *, int, int, int); +static int m_file (struct msgs *, char *, int, struct st_fold *, int, int, int); +static void copy_seqs (struct msgs *, int, struct msgs *, int); int main (int argc, char **argv) { - int linkf = 0, preserve = 0, filep = 0; - int foldp = 0, isdf = 0, unlink_msgs = 0; + bool linkf = false; + bool preserve = false; + bool retainseqs = false; + int filep = 0; + int foldp = 0, isdf = 0; + bool unlink_msgs = false; int i, msgnum; char *cp, *folder = NULL, buf[BUFSIZ]; char **argp, **arguments; @@ -73,13 +91,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], true, true)) { return 1; } arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; @@ -90,76 +102,83 @@ main (int argc, char **argv) while ((cp = *argp++)) { if (*cp == '-') { switch (smatch (++cp, switches)) { - case AMBIGSW: + case AMBIGSW: ambigsw (cp, switches); done (1); - case UNKWNSW: - adios (NULL, "-%s unknown\n", cp); + case UNKWNSW: + die("-%s unknown\n", cp); - case HELPSW: + case HELPSW: snprintf (buf, sizeof(buf), "%s [msgs] [switches] +folder ...", invo_name); print_help (buf, switches, 1); - done (1); + done (0); case VERSIONSW: print_version(invo_name); - done (1); + done (0); - case LINKSW: - linkf++; + case LINKSW: + linkf = true; continue; - case NLINKSW: - linkf = 0; + case NLINKSW: + linkf = false; continue; - case PRESSW: - preserve++; + case PRESSW: + preserve = true; continue; - case NPRESSW: - preserve = 0; + case NPRESSW: + preserve = false; + continue; + + case RETAINSEQSSW: + retainseqs = true; + continue; + case NRETAINSEQSSW: + retainseqs = false; continue; case UNLINKSW: - unlink_msgs++; + unlink_msgs = true; continue; case NUNLINKSW: - unlink_msgs = 0; + unlink_msgs = false; continue; - case SRCSW: + case SRCSW: if (folder) - adios (NULL, "only one source folder at a time!"); + die("only one source folder at a time!"); if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); folder = path (*cp == '+' || *cp == '@' ? cp + 1 : cp, *cp != '@' ? TFOLDER : TSUBCWF); continue; case DRAFTSW: if (filep > NFOLDERS) - adios (NULL, "only %d files allowed!", NFOLDERS); + die("only %d files allowed!", NFOLDERS); isdf = 0; - files[filep++] = getcpy (m_draft (NULL, NULL, 1, &isdf)); + files[filep++] = mh_xstrdup(m_draft(NULL, NULL, 1, &isdf)); continue; - case FILESW: + case FILESW: if (filep > NFOLDERS) - adios (NULL, "only %d files allowed!", NFOLDERS); + die("only %d files allowed!", NFOLDERS); if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); files[filep++] = path (cp, TFILE); continue; - case RPROCSW: + case RPROCSW: if (!(rmmproc = *argp++) || *rmmproc == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); continue; - case NRPRCSW: + case NRPRCSW: rmmproc = NULL; continue; } } if (*cp == '+' || *cp == '@') { if (foldp > NFOLDERS) - adios (NULL, "only %d folders allowed!", NFOLDERS); + die("only %d folders allowed!", NFOLDERS); folders[foldp++].f_name = pluspath (cp); } else @@ -169,22 +188,17 @@ main (int argc, char **argv) if (!context_find ("path")) free (path ("./", TFOLDER)); if (foldp == 0) - adios (NULL, "no folder specified"); - -#ifdef WHATNOW - if (!msgs.size && !foldp && !filep && (cp = getenv ("mhdraft")) && *cp) - files[filep++] = cp; -#endif /* WHATNOW */ + die("no folder specified"); /* * 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); + die("use -file or some messages, not both"); + opnfolds (NULL, folders, foldp); for (i = 0; i < filep; i++) - if (m_file (files[i], folders, foldp, preserve, 0)) + if (m_file (0, files[i], 0, folders, foldp, preserve, 0)) done (1); /* If -nolink, then "remove" files */ if (!linkf) @@ -202,12 +216,12 @@ main (int argc, char **argv) adios (maildir, "unable to change directory to"); /* read source folder and create message structure */ - if (!(mp = folder_read (folder))) - adios (NULL, "unable to read folder %s", folder); + if (!(mp = folder_read (folder, 1))) + die("unable to read folder %s", folder); /* check for empty folder */ if (mp->nummsg == 0) - adios (NULL, "no messages in %s", folder); + die("no messages in %s", folder); /* parse the message range/sequence/name and set SELECTED */ for (msgnum = 0; msgnum < msgs.size; msgnum++) @@ -216,7 +230,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. * @@ -226,24 +240,36 @@ main (int argc, char **argv) */ for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { if (is_selected (mp, msgnum)) { - cp = getcpy (m_name (msgnum)); - if (m_file (cp, folders, foldp, preserve, !linkf)) + cp = mh_xstrdup(m_name (msgnum)); + if (m_file (mp, cp, retainseqs ? msgnum : 0, folders, foldp, + preserve, !linkf)) done (1); free (cp); } } /* - * 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. * @@ -252,17 +278,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; @@ -275,41 +295,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))) - 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))) + die("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; @@ -328,43 +362,80 @@ clsfolds (struct st_fold *folders, int nfolders) static void remove_files (int filep, char **files) { - int i; - char **vec; + int i, vecp; + char **vec, *program; /* If rmmproc is defined, we use that */ if (rmmproc) { - vec = files++; /* vec[0] = filevec[0] */ - files[filep] = NULL; /* NULL terminate list */ + vec = argsplit(rmmproc, &program, &vecp); + files++; /* Yes, we need to do this */ + for (i = 0; i < filep; i++) + vec[vecp++] = files[i]; + vec[vecp] = NULL; /* NULL terminate list */ fflush (stdout); - vec[0] = r1bindex (rmmproc, '/'); - execvp (rmmproc, vec); + execvp (program, vec); adios (rmmproc, "unable to exec"); } /* 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"); } } /* - * Link (or copy) the message into each of - * the destination folders. + * Link (or copy) the message into each of the destination folders. + * If oldmsgnum is not 0, call copy_seqs(). */ static int -m_file (char *msgfile, struct st_fold *folders, int nfolders, int preserve, int refile) +m_file (struct msgs *mp, char *msgfile, int oldmsgnum, + struct st_fold *folders, int nfolders, int preserve, int refile) { int msgnum; 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); } return 0; } + + +/* + * Copy sequence information for a refiled message to its + * new folder. Skip the cur sequence. + */ +static void +copy_seqs (struct msgs *oldmp, int oldmsgnum, struct msgs *newmp, int newmsgnum) +{ + char **seq; + size_t seqnum; + + for (seq = svector_strs (oldmp->msgattrs), seqnum = 0; + *seq && seqnum < svector_size (oldmp->msgattrs); + ++seq, ++seqnum) { + if (strcmp (current, *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); + } + } + } +}