Add basic support for the STLS command in POP

[nmh] / uip / show.c

diff --git a/uip/show.c b/uip/show.c
index 3943118a64e9a44f7b962b94ea34c7f711668af8..699b77b0b8170eb3bb80bd238da6ab5706af1f9c 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -5,10 +5,35 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/mime.h>
+#include "h/mh.h"
+#include "mhlsbr.h"
+#include "sbr/m_name.h"
+#include "sbr/m_getfld.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_setunseen.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_setcur.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/r1bindex.h"
+#include "sbr/uprf.h"
+#include "sbr/check_charset.h"
+#include "sbr/m_draft.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.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/arglist.h"
+#include "sbr/error.h"
+#include "h/mime.h"
 #include "h/done.h"
-#include <h/utils.h>
+#include "h/utils.h"
 #include "sbr/m_maildir.h"
 
 #define SHOW_SWITCHES \
@@ -66,9 +91,10 @@ static int is_nontext(char *);
 int
 main (int argc, char **argv)
 {
-    int draftsw = 0;
+    bool draftsw = false;
     bool headersw = true;
-    int nshow = 0, checkmime = 1;
+    bool nshow = false;
+    bool checkmime = true;
     bool mime = false;
     int isdf = 0, mode = SHOW, msgnum;
     char *cp, *maildir, *file = NULL, *folder = NULL, *proc, *program;
@@ -126,7 +152,7 @@ non_mhl_switches:
                case DRFTSW:
                    if (file)
                        die("only one file at a time!");
-                   draftsw++;
+                   draftsw = true;
                    if (mode == SHOW)
                        continue;
 usage:
@@ -168,22 +194,22 @@ usage:
                case SHOWSW:
                    if (!(showproc = *argp++) || *showproc == '-')
                        die("missing argument to %s", argp[-2]);
-                   nshow = 0;
+                   nshow = false;
                    continue;
                case NSHOWSW:
-                   nshow++;
+                   nshow = true;
                    continue;
 
                case SHOWMIMESW:
                    if (!(showmimeproc = *argp++) || *showmimeproc == '-')
                        die("missing argument to %s", argp[-2]);
-                   nshow = 0;
+                   nshow = false;
                    continue;
                case CHECKMIMESW:
-                   checkmime++;
+                   checkmime = true;
                    continue;
                case NOCHECKMIMESW:
-                   checkmime = 0;
+                   checkmime = false;
                    continue;
            }
        }