Replace done with exit at uip

[mmh] / uip / rmm.c

diff --git a/uip/rmm.c b/uip/rmm.c
index 0aab0ba..9401d2b 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -33,10 +33,7 @@ main(int argc, char **argv)
        struct msgs *mp;
        pid_t pid;
 
-
-#ifdef LOCALE
        setlocale(LC_ALL, "");
-#endif
        invo_name = mhbasename(argv[0]);
 
        context_read();
@@ -50,17 +47,17 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               done(1);
+                               exit(1);
                        case UNKWNSW:
                                adios(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(0);
                        case VERSIONSW:
                                print_version(invo_name);
-                               done(1);
+                               exit(0);
 
                        case UNLINKSW:
                                unlink_msgs++;
@@ -71,84 +68,76 @@ main(int argc, char **argv)
                        }
                }
                if (*cp == '+' || *cp == '@') {
-                       if (folder)
+                       if (folder) {
                                adios(NULL, "only one folder at a time!");
-                       else
+                       } else {
                                folder = getcpy(expandfol(cp));
-               } else
+                       }
+               } 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)
+       if (chdir(maildir) == NOTOK) {
                adios(maildir, "unable to change directory to");
+       }
 
        /* read folder and create message structure */
-       if (!(mp = folder_read(folder)))
+       if (!(mp = folder_read(folder))) {
                adios(NULL, "unable to read folder %s", folder);
-
-       /* check for empty folder */
-       if (mp->nummsg == 0)
+       }
+       if (mp->nummsg == 0) {
                adios(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])) {
+                       /* sysexits EX_USAGE */
+                       exit(1);
+               }
+       }
 
-       /* 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();
 
        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)
+       if (msgs.size+6 > MAXARGS) {
                adios(NULL, "more than %d messages for refile exec",
-                               MAXARGS - 4);
-       vec = (char **)mh_xmalloc((size_t)(mp->numsel + 4) * sizeof(*vec));
+                               MAXARGS - 6);
+       }
+       vec = (char **)mh_xmalloc((size_t)(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;
 
@@ -167,7 +156,5 @@ main(int argc, char **argv)
                pidwait(pid, -1);
        }
 
-       folder_free(mp);
-       done(0);
-       return 1;
+       return 0;
 }