* -- into one or more destination folders
*
* $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh. See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
*/
#include <h/mh.h>
+#include <h/utils.h>
#include <fcntl.h>
#include <errno.h>
-/*
- * We allocate spaces for messages (msgs array)
- * this number of elements at a time.
- */
-#define MAXMSGS 256
-
-
static struct swit switches[] = {
#define DRAFTSW 0
{ "draft", 0 },
#define VERSIONSW 11
{ "version", 0 },
#define HELPSW 12
- { "help", 4 },
+ { "help", 0 },
{ NULL, 0 }
};
-extern int errno;
-
static char maildir[BUFSIZ];
struct st_fold {
static void opnfolds (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);
+static int m_file (char *, struct st_fold *, int, int, int);
int
{
int linkf = 0, preserve = 0, filep = 0;
int foldp = 0, isdf = 0, unlink_msgs = 0;
- int i, msgnum, nummsgs, maxmsgs;
+ int i, msgnum;
char *cp, *folder = NULL, buf[BUFSIZ];
- char **argp, **arguments, **msgs;
+ char **argp, **arguments;
char *filevec[NFOLDERS + 2];
char **files = &filevec[1]; /* leave room for remove_files:vec[0] */
struct st_fold folders[NFOLDERS + 1];
+ struct msgs_array msgs = { 0, 0, NULL };
struct msgs *mp;
#ifdef LOCALE
argp = arguments;
/*
- * Allocate the initial space to record message
- * names, ranges, and sequences.
- */
- nummsgs = 0;
- maxmsgs = MAXMSGS;
- if (!(msgs = (char **) malloc ((size_t) (maxmsgs * sizeof(*msgs)))))
- adios (NULL, "unable to allocate storage");
-
- /*
* Parse arguments
*/
while ((cp = *argp++)) {
if (foldp > NFOLDERS)
adios (NULL, "only %d folders allowed!", NFOLDERS);
folders[foldp++].f_name =
- path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
- } else {
- /*
- * Check if we need to allocate more space
- * for message names, ranges, and sequences.
- */
- if (nummsgs >= maxmsgs) {
- maxmsgs += MAXMSGS;
- if (!(msgs = (char **) realloc (msgs,
- (size_t) (maxmsgs * sizeof(*msgs)))))
- adios (NULL, "unable to reallocate msgs storage");
- }
- msgs[nummsgs++] = cp;
- }
+ pluspath (cp);
+ } else
+ app_msgarg(&msgs, cp);
}
if (!context_find ("path"))
adios (NULL, "no folder specified");
#ifdef WHATNOW
- if (!nummsgs && !foldp && !filep && (cp = getenv ("mhdraft")) && *cp)
+ 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 || nummsgs)
+ if (folder || msgs.size)
adios (NULL, "use -file or some messages, not both");
opnfolds (folders, foldp);
for (i = 0; i < filep; i++)
- if (m_file (files[i], folders, foldp, preserve))
+ if (m_file (files[i], folders, foldp, preserve, 0))
done (1);
/* If -nolink, then "remove" files */
if (!linkf)
done (0);
}
- if (!nummsgs)
- msgs[nummsgs++] = "cur";
+ if (!msgs.size)
+ app_msgarg(&msgs, "cur");
if (!folder)
folder = getfolder (1);
strncpy (maildir, m_maildir (folder), sizeof(maildir));
adios (NULL, "no messages in %s", folder);
/* parse the message range/sequence/name and set SELECTED */
- for (msgnum = 0; msgnum < nummsgs; msgnum++)
- if (!m_convert (mp, msgs[msgnum]))
+ for (msgnum = 0; msgnum < msgs.size; msgnum++)
+ if (!m_convert (mp, msgs.msgs[msgnum]))
done (1);
seq_setprev (mp); /* set the previous-sequence */
/* create folder structures for each destination folder */
opnfolds (folders, foldp);
- /* Link all the selected messages into destination folders */
+ /* Link all the selected messages into destination folders.
+ *
+ * This causes the add hook to be run for messages that are
+ * linked into another folder. The refile hook is run for
+ * messages that are moved to another folder.
+ */
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))
+ if (m_file (cp, folders, foldp, preserve, !linkf))
done (1);
free (cp);
}
fflush (stdout);
}
- /* If -nolink, then "remove" messages from source folder */
+ /* If -nolink, then "remove" messages from source folder.
+ *
+ * Note that folder_delmsgs does not call the delete hook
+ * because the message has already been handled above.
+ */
if (!linkf) {
- folder_delmsgs (mp, unlink_msgs);
+ folder_delmsgs (mp, unlink_msgs, 1);
}
clsfolds (folders, foldp);
context_replace (pfolder, folder); /* update current folder */
context_save (); /* save the context file */
folder_free (mp); /* free folder structure */
- return done (0);
+ done (0);
+ return 1;
}
static void
opnfolds (struct st_fold *folders, int nfolders)
{
- register char *cp;
char nmaildir[BUFSIZ];
register struct st_fold *fp, *ep;
register struct msgs *mp;
- struct stat st;
for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
chdir (m_maildir (""));
strncpy (nmaildir, m_maildir (fp->f_name), sizeof(nmaildir));
- if (stat (nmaildir, &st) == NOTOK) {
- if (errno != ENOENT)
- adios (nmaildir, "error on folder");
- cp = concat ("Create folder \"", nmaildir, "\"? ", NULL);
- if (!getanswer (cp))
- done (1);
- free (cp);
- if (!makedir (nmaildir))
- adios (NULL, "unable to create folder %s", nmaildir);
- }
+ create_folder (nmaildir, 0, done);
if (chdir (nmaildir) == NOTOK)
adios (nmaildir, "unable to change directory to");
*/
static int
-m_file (char *msgfile, struct st_fold *folders, int nfolders, int preserve)
+m_file (char *msgfile, 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)) == -1)
+ if ((msgnum = folder_addmsg (&fp->f_mp, msgfile, 1, 0, preserve, nfolders == 1 && refile, maildir)) == -1)
return 1;
}
return 0;
projects / mmh / blobdiff