-
-/*
- * 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
* complete copyright information.
*/
-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.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 <fcntl.h>
-#include <errno.h>
-#include <assert.h>
#define REFILE_SWITCHES \
X("draft", 0, DRAFTSW) \
/*
* 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);
int
main (int argc, char **argv)
{
- int linkf = 0, preserve = 0, retainseqs = 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;
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;
ambigsw (cp, switches);
done (1);
case UNKWNSW:
- adios (NULL, "-%s unknown\n", cp);
+ die("-%s unknown\n", cp);
case HELPSW:
snprintf (buf, sizeof(buf), "%s [msgs] [switches] +folder ...",
done (0);
case LINKSW:
- linkf++;
+ linkf = true;
continue;
case NLINKSW:
- linkf = 0;
+ linkf = false;
continue;
case PRESSW:
- preserve++;
+ preserve = true;
continue;
case NPRESSW:
- preserve = 0;
+ preserve = false;
continue;
case RETAINSEQSSW:
- retainseqs = 1;
+ retainseqs = true;
continue;
case NRETAINSEQSSW:
- retainseqs = 0;
+ retainseqs = false;
continue;
case UNLINKSW:
- unlink_msgs++;
+ unlink_msgs = true;
continue;
case NUNLINKSW:
- unlink_msgs = 0;
+ unlink_msgs = false;
continue;
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:
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:
if (!(rmmproc = *argp++) || *rmmproc == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ die("missing argument to %s", argp[-2]);
continue;
case NRPRCSW:
rmmproc = NULL;
}
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
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 (0, files[i], 0, folders, foldp, preserve, 0))
done (1);
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++)
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.
*
*/
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);
}
/*
- * 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.
+ */
+
+ 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().
*/
- if (rmmproc) {
- context_replace (pfolder, folder);
- context_save ();
- fflush (stdout);
- }
+
+ clsfolds (folders, foldp);
/* If -nolink, then "remove" messages from source folder.
*
*/
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;
*/
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;
/* 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");
}
}
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);
}
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);
+ !is_seq_private (oldmp, seqnum), 0);
}
}
}
projects / nmh / blobdiff