Add basic support for the STLS command in POP

[nmh] / uip / mark.c

diff --git a/uip/mark.c b/uip/mark.c
index 00cc2fb279ffa7dcfeda2b15588af4eded512ef4..72328bacaccfae16cebfb5e3fdd79ec4afe9d416 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -7,9 +7,29 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/snprintb.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_bits.h"
+#include "sbr/seq_del.h"
+#include "sbr/seq_print.h"
+#include "sbr/seq_add.h"
+#include "sbr/error.h"
 #include "h/done.h"
-#include <h/utils.h>
+#include "h/utils.h"
 #include "sbr/m_maildir.h"
 
 #define MARK_SWITCHES \
@@ -43,8 +63,13 @@ static void seq_printdebug (struct msgs *);
 int
 main (int argc, char **argv)
 {
-    int addsw = 0, deletesw = 0, debugsw = 0;
-    int listsw = 0, publicsw = -1, zerosw = 0, msgnum;
+    bool addsw = false;
+    bool deletesw = false;
+    bool debugsw = false;
+    bool listsw = false;
+    int publicsw = -1;
+    bool zerosw = false;
+    int msgnum;
     unsigned int seqp = 0;
     char *cp, *maildir, *folder = NULL, buf[BUFSIZ];
     char **argp, **arguments;
@@ -52,7 +77,7 @@ main (int argc, char **argv)
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -79,16 +104,19 @@ main (int argc, char **argv)
                done (0);
 
            case ADDSW: 
-               addsw++;
-               deletesw = listsw = 0;
+               addsw = true;
+               deletesw = false;
+                listsw = false;
                continue;
            case DELSW: 
-               deletesw++;
-               addsw = listsw = 0;
+               deletesw = true;
+               addsw = false;
+                listsw = false;
                continue;
            case LSTSW: 
-               listsw++;
-               addsw = deletesw = 0;
+               listsw = true;
+               addsw = false;
+                deletesw = false;
                continue;
 
            case SEQSW: 
@@ -107,14 +135,14 @@ main (int argc, char **argv)
                continue;
 
            case DEBUGSW: 
-               debugsw++;
+               debugsw = true;
                continue;
 
            case ZEROSW: 
-               zerosw++;
+               zerosw = true;
                continue;
            case NZEROSW: 
-               zerosw = 0;
+               zerosw = false;
                continue;
            }
        }
@@ -133,9 +161,9 @@ main (int argc, char **argv)
      */
     if (!addsw && !deletesw && !listsw) {
        if (seqp)
-           addsw++;
+           addsw = true;
        else
-           listsw++;
+           listsw = true;
     }
 
     if (!context_find ("path"))