{ "link", 0 },
#define NLINKSW 1
{ "nolink", 0 },
-#define PRESSW 2
- { "preserve", 0 },
-#define NPRESSW 3
- { "nopreserve", 0 },
-#define UNLINKSW 4
- { "unlink", 0 },
-#define NUNLINKSW 5
- { "nounlink", 0 },
-#define SRCSW 6
+#define SRCSW 2
{ "src +folder", 0 },
-#define FILESW 7
+#define FILESW 3
{ "file file", 0 },
-#define RPROCSW 8
- { "rmmproc program", 0 },
-#define NRPRCSW 9
- { "normmproc", 0 },
-#define VERSIONSW 10
- { "version", 0 },
-#define HELPSW 11
+#define VERSIONSW 4
+ { "Version", 0 },
+#define HELPSW 5
{ "help", 0 },
{ NULL, 0 }
};
*/
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, int);
+static int m_file(char *, struct st_fold *, int, int);
int
main(int argc, char **argv)
{
- int linkf = 0, preserve = 0, filep = 0;
- int foldp = 0, unlink_msgs = 0;
+ int linkf = 0, filep = 0;
+ int foldp = 0;
int i, msgnum;
char *cp, *folder = NULL, buf[BUFSIZ];
char **argp, **arguments;
- char *filevec[NFOLDERS + 2];
- char **files = &filevec[1]; /* leave room for remove_files:vec[0] */
+ char *filevec[NFOLDERS + 1];
+ char **files = filevec;
struct st_fold folders[NFOLDERS + 1];
struct msgs_array msgs = { 0, 0, NULL };
struct msgs *mp;
#endif
invo_name = mhbasename(argv[0]);
- /* read user profile/context */
context_read();
arguments = getarguments(invo_name, argc, argv, 1);
linkf = 0;
continue;
- case PRESSW:
- preserve++;
- continue;
- case NPRESSW:
- preserve = 0;
- continue;
-
- case UNLINKSW:
- unlink_msgs++;
- continue;
- case NUNLINKSW:
- unlink_msgs = 0;
- continue;
-
case SRCSW:
if (folder)
adios(NULL, "only one source folder at a time!");
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
- folder = pluspath(cp);
+ folder = getcpy(expandfol(cp));
continue;
case FILESW:
if (filep > NFOLDERS)
if (!(cp = *argp++) || *cp == '-')
adios(NULL, "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]);
- continue;
- case NRPRCSW:
- rmmproc = NULL;
+ files[filep++] = getcpy(expanddir(cp));
continue;
}
}
if (foldp > NFOLDERS)
adios(NULL, "only %d folders allowed!",
NFOLDERS);
- folders[foldp++].f_name =
- pluspath(cp);
+ folders[foldp++].f_name = getcpy(expandfol(cp));
} else
- app_msgarg(&msgs, cp);
+ app_msgarg(&msgs, cp);
}
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
*/
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, 0))
+ if (m_file(files[i], folders, foldp, 0))
done(1);
- /* If -nolink, then "remove" files */
- if (!linkf)
- remove_files(filep, filevec);
+ /* If -nolink, then unlink files */
+ if (!linkf) {
+ int i;
+ char **files = filevec;
+
+ /* just unlink the files */
+ for (i = 0; i < filep; i++) {
+ if (unlink(files[i]) == NOTOK)
+ admonish(files[i], "unable to unlink");
+ }
+ }
done(0);
}
if (!msgs.size)
- app_msgarg(&msgs, "cur");
+ app_msgarg(&msgs, seq_cur);
if (!folder)
- folder = getfolder(FCUR);
- strncpy(maildir, m_maildir(folder), sizeof(maildir));
+ folder = getcurfol();
+ strncpy(maildir, toabsdir(folder), sizeof(maildir));
if (chdir(maildir) == NOTOK)
adios(maildir, "unable to change directory to");
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))
+ if (m_file(cp, folders, foldp, !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().
- */
- if (rmmproc) {
- context_replace(pfolder, folder);
- context_save();
- fflush(stdout);
- }
-
- /*
- ** If -nolink, then "remove" messages from source folder.
+ ** If -nolink, then remove (= unlink) 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, 1);
+ folder_delmsgs(mp, 0);
}
clsfolds(folders, foldp);
- if (mp->hghsel != mp->curmsg &&
- (mp->numsel != mp->nummsg || linkf))
+ if (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 */
+ context_replace(curfolder, folder);
+ context_save();
+ folder_free(mp);
done(0);
return 1;
}
** Read all the destination folders and
** create folder structures for all of them.
*/
-
static void
opnfolds(struct st_fold *folders, int nfolders)
{
register struct msgs *mp;
for (fp = folders, ep = folders + nfolders; fp < ep; fp++) {
- chdir(m_maildir(""));
- strncpy(nmaildir, m_maildir(fp->f_name), sizeof(nmaildir));
+ chdir(toabsdir("+"));
+ strncpy(nmaildir, toabsdir(fp->f_name), sizeof(nmaildir));
create_folder(nmaildir, 0, done);
** Set the Previous-Sequence and then sychronize the
** sequence file, for each destination folder.
*/
-
static void
clsfolds(struct st_fold *folders, int nfolders)
{
/*
-** If you have a "rmmproc" defined, we called that
-** to remove all the specified files. If "rmmproc"
-** is not defined, then just unlink the files.
-*/
-
-static void
-remove_files(int filep, char **files)
-{
- int i;
- char **vec;
-
- /* If rmmproc is defined, we use that */
- if (rmmproc) {
- vec = files++; /* vec[0] = filevec[0] */
- files[filep] = NULL; /* NULL terminate list */
-
- fflush(stdout);
- vec[0] = mhbasename(rmmproc);
- execvp(rmmproc, 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)
- admonish(files[i], "unable to unlink");
- }
-}
-
-
-/*
** Link (or copy) the message into each of
** the destination folders.
*/
-
static int
-m_file(char *msgfile, struct st_fold *folders, int nfolders, int preserve,
- int refile)
+m_file(char *msgfile, struct st_fold *folders, int nfolders, 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)
+ 0, nfolders == 1 && refile, maildir)) == -1)
return 1;
}
return 0;
projects / mmh / blobdiff