scansbr.c: Move interface to own file.

[nmh] / uip / pick.c

diff --git a/uip/pick.c b/uip/pick.c
index 4bfc17a60ae145759153e19935fc3f2f13886f16..9abb826674977a8d3ed848d20433353ed9f53814 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -5,11 +5,30 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/tws.h>
-#include <h/picksbr.h>
+#include "h/mh.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/picksbr.h"

 #include "h/done.h"
 #include "h/done.h"

-#include <h/utils.h>
+#include "h/utils.h"

 #include "sbr/m_maildir.h"
 
 #define PICK_SWITCHES \
 #include "sbr/m_maildir.h"
 
 #define PICK_SWITCHES \


@@ -56,7 +75,9 @@ static void putzero_done (int) NORETURN;
 int
 main (int argc, char **argv)
 {
 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];
     size_t seqp = 0;
     int msgnum;
     char *maildir, *folder = NULL, buf[100];


@@ -68,7 +89,7 @@ main (int argc, char **argv)
     struct msgs *mp, *mp2;
     FILE *fp;
     int debug = 0;
     struct msgs *mp, *mp2;
     FILE *fp;
     int debug = 0;

-    int reverse = 0;
+    bool reverse = false;

     int start, end, inc;
 
     if (nmh_init(argv[0], true, true)) { return 1; }
     int start, end, inc;
 
     if (nmh_init(argv[0], true, true)) { return 1; }


@@ -104,7 +125,7 @@ main (int argc, char **argv)
                done (0);
 
             case REVSW:
                done (0);
 
             case REVSW:

-                reverse = 1;
+                reverse = true;

                 continue;
 
            case CCSW: 
                 continue;
 
            case CCSW: 


@@ -153,10 +174,10 @@ main (int argc, char **argv)
                publicsw = 0;
                continue;
            case ZEROSW: 
                publicsw = 0;
                continue;
            case ZEROSW: 

-               zerosw++;
+               zerosw = true;

                continue;
            case NZEROSW: 
                continue;
            case NZEROSW: 

-               zerosw = 0;
+               zerosw = false;

                continue;
 
            case LISTSW: 
                continue;
 
            case LISTSW: