#include <h/mh.h>
#include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
static struct swit switches[] = {
#define UNLINKSW 0
{ NULL, 0 }
};
+char *version=VERSION;
int
main(int argc, char **argv)
char **arguments;
struct msgs_array msgs = { 0, 0, NULL };
struct msgs *mp;
- pid_t pid;
setlocale(LC_ALL, "");
invo_name = mhbasename(argv[0]);
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
- done(1);
+ exit(EX_USAGE);
case UNKWNSW:
- adios(NULL, "-%s unknown\n", cp);
+ adios(EX_USAGE, NULL, "-%s unknown\n", cp);
case HELPSW:
snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
print_help(buf, switches, 1);
- done(1);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case VERSIONSW:
print_version(invo_name);
- done(1);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case UNLINKSW:
unlink_msgs++;
}
}
if (*cp == '+' || *cp == '@') {
- if (folder)
- adios(NULL, "only one folder at a time!");
- else
- folder = getcpy(expandfol(cp));
- } else
+ if (folder) {
+ adios(EX_USAGE, NULL, "only one folder at a time!");
+ } else {
+ folder = mh_xstrdup(expandfol(cp));
+ }
+ } else {
app_msgarg(&msgs, cp);
+ }
}
- if (!msgs.size)
+ if (!msgs.size) {
app_msgarg(&msgs, seq_cur);
- if (!folder)
+ }
+ if (!folder) {
folder = getcurfol();
+ }
maildir = toabsdir(folder);
- if (chdir(maildir) == NOTOK)
- adios(maildir, "unable to change directory to");
+ if (chdir(maildir) == NOTOK) {
+ adios(EX_OSERR, maildir, "unable to change directory to");
+ }
/* read folder and create message structure */
- if (!(mp = folder_read(folder)))
- adios(NULL, "unable to read folder %s", folder);
-
- /* check for empty folder */
- if (mp->nummsg == 0)
- adios(NULL, "no messages in %s", folder);
-
- /* parse all the message ranges/sequences and set SELECTED */
- for (msgnum = 0; msgnum < msgs.size; msgnum++)
- if (!m_convert(mp, msgs.msgs[msgnum]))
- done(1);
- seq_setprev(mp); /* set the previous-sequence */
+ if (!(mp = folder_read(folder))) {
+ adios(EX_IOERR, NULL, "unable to read folder %s", folder);
+ }
+ if (mp->nummsg == 0) {
+ adios(EX_DATAERR, NULL, "no messages in %s", folder);
+ }
+ /*
+ ** parse all the message ranges/sequences and set SELECTED
+ ** (We do this for the refiling case as well, to complain
+ ** about invalid msg arguments in rmm, before we call refile.)
+ */
+ for (msgnum = 0; msgnum < msgs.size; msgnum++) {
+ if (!m_convert(mp, msgs.msgs[msgnum])) {
+ exit(EX_USAGE);
+ }
+ }
+ context_replace(curfolder, folder);
+ context_save();
if (unlink_msgs) {
/* "remove" the SELECTED messages */
folder_delmsgs(mp, 1);
-
+ seq_setprev(mp);
seq_save(mp);
- context_replace(curfolder, folder);
- context_save();
folder_free(mp);
- done(0);
- return 1;
+ return 0;
}
- /*
- ** This is hackish. If we don't unlink, but refile,
- ** then we need to update the current folder in the
- ** context so the external program will refile files
- ** from the correct directory.
- */
- context_replace(curfolder, folder);
- context_save();
- fflush(stdout);
-
/* remove by refiling. */
- /* Unset the EXISTS flag for each message to be removed */
- for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
- if (is_selected(mp, msgnum))
- unset_exists(mp, msgnum);
- }
- /* Mark that the sequence information has changed */
- mp->msgflags |= SEQMOD;
+ folder_free(mp);
+ fflush(stdout);
- if (mp->numsel+4 > MAXARGS)
- adios(NULL, "more than %d messages for refile exec",
- MAXARGS - 4);
- vec = (char **)mh_xmalloc((size_t)(mp->numsel + 4) * sizeof(*vec));
+ if (msgs.size+6 > MAXARGS) {
+ adios(EX_SOFTWARE, NULL, "more than %d messages for refile exec",
+ MAXARGS - 6);
+ }
+ vec = mh_xcalloc(msgs.size + 6, sizeof(*vec));
vec[vecp++] = "refile";
+ vec[vecp++] = "-src";
+ vec[vecp++] = concat("+", folder, NULL);
vec[vecp++] = "-nolink";
vec[vecp++] = concat("+", trashfolder, NULL);
- for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
- if (!is_selected(mp, msgnum)) {
- continue;
- }
- if (!(vec[vecp++] = strdup(m_name(msgnum)))) {
- adios(NULL, "strdup failed");
- }
+ for (msgnum = 0; msgnum < msgs.size; msgnum++) {
+ vec[vecp++] = msgs.msgs[msgnum];
}
vec[vecp] = NULL;
- fflush(stdout);
- switch (pid = fork()) {
- case -1:
- adios("fork", "unable to");
-
- case 0:
- execvp(*vec, vec);
- fprintf(stderr, "unable to exec ");
- perror(*vec);
- _exit(-1);
-
- default:
- pidwait(pid, -1);
- }
-
- folder_free(mp);
- done(0);
- return 1;
+ return execprog(*vec, vec);
}
projects / mmh / blobdiff