X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frmm.c;h=5059383d74c135b8d77b51700f4504e89111df18;hp=53103fd61121009acab45a203a022699b6549269;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1 diff --git a/uip/rmm.c b/uip/rmm.c index 53103fd..5059383 100644 --- a/uip/rmm.c +++ b/uip/rmm.c @@ -1,66 +1,66 @@ /* - * rmm.c -- remove a message(s) - * - * 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. - */ +** rmm.c -- remove a message(s) +** +** 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 #include +#include +#include +#include static struct swit switches[] = { #define UNLINKSW 0 { "unlink", 0 }, #define NUNLINKSW 1 - { "nounlink", 0 }, + { "nounlink", 2 }, #define VERSIONSW 2 - { "version", 0 }, + { "Version", 0 }, #define HELPSW 3 { "help", 0 }, { NULL, 0 } }; +char *version=VERSION; int -main (int argc, char **argv) +main(int argc, char **argv) { - int msgnum, unlink_msgs = 0; - char *cp, *maildir, *folder = NULL; + int msgnum, unlink_msgs = 0, vecp = 0; + char *cp, *maildir, *folder = NULL, **vec; char buf[BUFSIZ], **argp; char **arguments; struct msgs_array msgs = { 0, 0, NULL }; struct msgs *mp; -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif - invo_name = r1bindex (argv[0], '/'); + invo_name = mhbasename(argv[0]); - /* read user profile/context */ context_read(); - arguments = getarguments (invo_name, argc, argv, 1); + arguments = getarguments(invo_name, argc, argv, 1); argp = arguments; /* parse arguments */ while ((cp = *argp++)) { if (*cp == '-') { - switch (smatch (++cp, switches)) { + switch (smatch(++cp, switches)) { case AMBIGSW: - ambigsw (cp, switches); - done (1); + ambigsw(cp, switches); + 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); + snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name); + print_help(buf, switches, 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++; @@ -71,59 +71,77 @@ main (int argc, char **argv) } } if (*cp == '+' || *cp == '@') { - if (folder) - adios (NULL, "only one folder at a time!"); - else - folder = pluspath (cp); - } else - app_msgarg(&msgs, cp); + if (folder) { + adios(EX_USAGE, NULL, "only one folder at a time!"); + } else { + folder = mh_xstrdup(expandfol(cp)); + } + } else { + app_msgarg(&msgs, cp); + } } - if (!context_find ("path")) - free (path ("./", TFOLDER)); - if (!msgs.size) - app_msgarg(&msgs, "cur"); - if (!folder) - folder = getfolder (1); - maildir = m_maildir (folder); + if (!msgs.size) { + app_msgarg(&msgs, seq_cur); + } + 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); + 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); + } + } - /* 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 */ + context_replace(curfolder, folder); + context_save(); - /* - * This is hackish. If we are using a external rmmproc, - * then we need to update the current folder in the - * context 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 (unlink_msgs) { + /* "remove" the SELECTED messages */ + folder_delmsgs(mp, 1); + seq_setprev(mp); + seq_save(mp); + folder_free(mp); + return 0; } - /* "remove" the SELECTED messages */ - folder_delmsgs (mp, unlink_msgs, 0); + /* remove by refiling. */ + + folder_free(mp); + fflush(stdout); + + 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 = 0; msgnum < msgs.size; msgnum++) { + vec[vecp++] = msgs.msgs[msgnum]; + } + vec[vecp] = NULL; - 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; + return execprog(*vec, vec); }