test-subpart: Send mhshow's stderr down pipe; don't discard.

[nmh] / uip / pick.c

diff --git a/uip/pick.c b/uip/pick.c
index 8e05d3a1e52848a01f70a3611b35531ee2cd52d1..40346d1a187b5441980e0b1099e906a3e06b076e 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -5,10 +5,31 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/tws.h>
-#include <h/picksbr.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "picksbr.h"
+#include "sbr/m_name.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.h"
+#include "sbr/folder_free.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/seq_nameok.h"
+#include "sbr/seq_add.h"
+#include "sbr/error.h"
+#include "h/tws.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/m_maildir.h"
 
 #define PICK_SWITCHES \
     X("reverse", 0, REVSW) \
@@ -54,7 +75,9 @@ static void putzero_done (int) NORETURN;
 int
 main (int argc, char **argv)
 {
-    int publicsw = -1, zerosw = 1, vecp = 0;
+    int publicsw = -1;
+    bool zerosw = true;
+    int vecp = 0;
     size_t seqp = 0;
     int msgnum;
     char *maildir, *folder = NULL, buf[100];
@@ -66,16 +89,12 @@ main (int argc, char **argv)
     struct msgs *mp, *mp2;
     FILE *fp;
     int debug = 0;
-    int reverse = 0;
+    bool reverse = false;
     int start, end, inc;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
-    done=putzero_done;
-
-    /* Deprecated.  Use -debug instead. */
-    if ((cp = getenv ("MHPDEBUG")) && *cp)
-       ++debug;
+    set_done(putzero_done);
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -92,7 +111,7 @@ main (int argc, char **argv)
                listsw = 0;     /* HACK */
                done (1);
            case UNKWNSW: 
-               adios (NULL, "-%s unknown", cp);
+               die("-%s unknown", cp);
 
            case HELPSW: 
                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
@@ -106,7 +125,7 @@ main (int argc, char **argv)
                done (0);
 
             case REVSW:
-                reverse = 1;
+                reverse = true;
                 continue;
 
            case CCSW: 
@@ -121,11 +140,11 @@ main (int argc, char **argv)
                vec[vecp++] = --cp;
            pattern:
                if (!(cp = *argp++))/* allow -xyz arguments */
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                vec[vecp++] = cp;
                continue;
            case OTHRSW: 
-               adios (NULL, "internal error!");
+               die("internal error!");
 
            case ANDSW:
            case ORSW:
@@ -137,7 +156,7 @@ main (int argc, char **argv)
 
            case SEQSW: 
                if (!(cp = *argp++) || *cp == '-')
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
 
                 if (!seq_nameok (cp))
                   done (1);
@@ -155,10 +174,10 @@ main (int argc, char **argv)
                publicsw = 0;
                continue;
            case ZEROSW: 
-               zerosw++;
+               zerosw = true;
                continue;
            case NZEROSW: 
-               zerosw = 0;
+               zerosw = false;
                continue;
 
            case LISTSW: 
@@ -175,9 +194,8 @@ main (int argc, char **argv)
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
-               adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+               die("only one folder at a time!");
+            folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
     }
@@ -202,11 +220,11 @@ main (int argc, char **argv)
 
     /* read folder and create message structure */
     if (!(mp = folder_read (folder, 0)))
-       adios (NULL, "unable to read folder %s", folder);
+       die("unable to read folder %s", folder);
 
     /* check for empty folder */
     if (mp->nummsg == 0)
-       adios (NULL, "no messages in %s", folder);
+       die("no messages in %s", folder);
 
     /* parse all the message ranges/sequences and set SELECTED */
     for (msgnum = 0; msgnum < msgs.size; msgnum++)
@@ -221,7 +239,7 @@ main (int argc, char **argv)
        listsw = !seqp;
 
     if (publicsw == 1 && is_readonly(mp))
-       adios (NULL, "folder %s is read-only, so -public not allowed", folder);
+       die("folder %s is read-only, so -public not allowed", folder);
 
     if (!pcompile (vec, NULL))
        done (1);
@@ -261,7 +279,7 @@ main (int argc, char **argv)
     }
 
     if (nums.size >= mp->numsel)
-       adios (NULL, "no messages match specification");
+       die("no messages match specification");
 
     /*
      * So, what's happening here?
@@ -274,7 +292,7 @@ main (int argc, char **argv)
      */
 
     if (!(mp2 = folder_read (folder, 1)))
-       adios (NULL, "unable to reread folder %s", folder);
+       die("unable to reread folder %s", folder);
 
     for (msgnum = 0; msgnum < msgs.size; msgnum++)
        if (!m_convert (mp2, msgs.msgs[msgnum]))