Synched common.sh.in from master to nmh-oauth.

[nmh] / uip / pick.c

diff --git a/uip/pick.c b/uip/pick.c
index 740f6f0a4e9524069b831a1bf88746708aa8a1e7..fba190a250abb35b124ae582ce37f2f21ec61556 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -13,6 +13,7 @@
 #include <h/utils.h>
 
 #define PICK_SWITCHES \
+    X("reverse", 0, REVSW) \
     X("and", 0, ANDSW) \
     X("or", 0, ORSW) \
     X("not", 0, NOTSW) \
@@ -36,6 +37,7 @@
     X("nozero", 0, NZEROSW) \
     X("list", 0, LISTSW) \
     X("nolist", 0, NLISTSW) \
+    X("debug", 0, DEBUGSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
 
@@ -65,11 +67,17 @@ main (int argc, char **argv)
     struct msgnum_array nums = { 0, 0, NULL };
     struct msgs *mp, *mp2;
     register FILE *fp;
+    int debug = 0;
+    int reverse = 0;
 
     if (nmh_init(argv[0], 1)) { return 1; }
 
     done=putzero_done;
 
+    /* Deprecated.  Use -debug instead. */
+    if ((cp = getenv ("MHPDEBUG")) && *cp)
+       ++debug;
+
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
@@ -98,6 +106,10 @@ main (int argc, char **argv)
                listsw = 0;     /* HACK */
                done (0);
 
+            case REVSW:
+                reverse = 1;
+                continue;
+
            case CCSW: 
            case DATESW: 
            case FROMSW: 
@@ -156,6 +168,10 @@ main (int argc, char **argv)
            case NLISTSW: 
                listsw = 0;
                continue;
+
+           case DEBUGSW:
+               ++debug;
+               continue;
            }
        }
        if (*cp == '+' || *cp == '@') {
@@ -221,11 +237,13 @@ main (int argc, char **argv)
      * match.  If there is NOT a match, then add it to a list to
      * remove from the final sequence (it will make sense later)
      */
-    for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
+    for (msgnum = reverse ? mp->hghsel : mp->lowsel;
+         reverse ? msgnum >= mp->lowsel : msgnum <= mp->hghsel;
+         msgnum += reverse ? -1 : 1) {
        if (is_selected (mp, msgnum)) {
            if ((fp = fopen (cp = m_name (msgnum), "r")) == NULL)
                admonish (cp, "unable to read message");
-           if (fp && pmatches (fp, msgnum, 0L, 0L)) {
+           if (fp && pmatches (fp, msgnum, 0L, 0L, debug)) {
                if (listsw)
                    printf ("%s\n", m_name (msgnum));
            } else {