Add basic support for the STLS command in POP

[nmh] / uip / mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 13fa3b7c7080d08a3974d68eb0106068d2069328..66d2366b027536e48660c159fdf44f7b588d5e25 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -5,18 +5,38 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/m_name.h"
+#include "sbr/m_gmprot.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/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/readconfig.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
 #include <fcntl.h>
-#include <h/signals.h>
-#include <h/md5.h>
-#include <h/mts.h>
-#include <h/tws.h>
-#include <h/fmt_scan.h>
-#include <h/mime.h>
-#include <h/mhparse.h>
-#include <h/mhcachesbr.h>
+#include "h/signals.h"
+#include "h/md5.h"
+#include "h/mts.h"
+#include "h/tws.h"
+#include "h/fmt_scan.h"
+#include "h/mime.h"
+#include "h/mhparse.h"
+#include "h/mhcachesbr.h"
 #include "h/done.h"
-#include <h/utils.h>
+#include "h/utils.h"
 #include "mhmisc.h"
 #include "sbr/m_maildir.h"
 #include "sbr/m_popen.h"
@@ -92,7 +112,7 @@ main (int argc, char **argv)
     CT ct, *ctp;
     FILE *fp;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }
 
     set_done(freects_done);
 
@@ -109,7 +129,7 @@ main (int argc, char **argv)
                ambigsw (cp, switches);
                done (1);
            case UNKWNSW:
-               adios (NULL, "-%s unknown", cp);
+               die("-%s unknown", cp);
 
            case HELPSW:
                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
@@ -127,13 +147,13 @@ main (int argc, char **argv)
                icachesw = &wcachesw;
 do_cache:
                if (!(cp = *argp++) || *cp == '-')
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                switch (*icachesw = smatch (cp, cache_policy)) {
                case AMBIGSW:
                    ambigsw (cp, cache_policy);
                    done (1);
                case UNKWNSW:
-                   adios (NULL, "%s unknown", cp);
+                   die("%s unknown", cp);
                default:
                    break;
                }
@@ -167,27 +187,27 @@ do_cache:
 
            case PARTSW:
                if (!(cp = *argp++) || *cp == '-')
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                if (npart >= NPARTS)
-                   adios (NULL, "too many parts (starting with %s), %d max",
+                   die("too many parts (starting with %s), %d max",
                           cp, NPARTS);
                parts[npart++] = cp;
                continue;
 
            case TYPESW:
                if (!(cp = *argp++) || *cp == '-')
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                if (ntype >= NTYPES)
-                   adios (NULL, "too many types (starting with %s), %d max",
+                   die("too many types (starting with %s), %d max",
                           cp, NTYPES);
                types[ntype++] = cp;
                continue;
 
            case PREFERSW:
                if (!(cp = *argp++) || *cp == '-')
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                if (npreferred >= NPREFS)
-                   adios (NULL, "too many preferred types (starting with %s), %d max",
+                   die("too many preferred types (starting with %s), %d max",
                           cp, NPREFS);
                mime_preference[npreferred].type = cp;
                cp = strchr(cp, '/');
@@ -201,13 +221,13 @@ do_cache:
 
            case FILESW:
                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                file = *cp == '-' ? cp : path (cp, TFILE);
                continue;
 
            case FORMSW:
                if (!(cp = *argp++) || *cp == '-')
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                 free(formsw);
                formsw = mh_xstrdup(etcpath(cp));
                continue;
@@ -221,12 +241,12 @@ do_cache:
 
            case HEADFORMSW:
                if (!(headerform = *argp++) || *headerform == '-')
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                continue;
 
            case MARKFORMSW:
                if (!(markerform = *argp++) || *markerform == '-')
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                continue;
 
            /*
@@ -234,7 +254,7 @@ do_cache:
             */
            case PROGSW:
                if (!(progsw = *argp++) || *progsw == '-')
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                continue;
            case NPROGSW:
                nomore++;
@@ -243,7 +263,7 @@ do_cache:
            case LENSW:
            case WIDTHSW:
                if (!(cp = *argp++) || *cp == '-')
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                continue;
 
            case VERBSW:
@@ -259,7 +279,7 @@ do_cache:
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
-               adios (NULL, "only one folder at a time!");
+               die("only one folder at a time!");
             folder = pluspath (cp);
        } else
                app_msgarg(&msgs, cp);
@@ -314,7 +334,7 @@ do_cache:
        free (path ("./", TFOLDER));
 
     if (file && msgs.size)
-       adios (NULL, "cannot specify msg and file at same time!");
+       die("cannot specify msg and file at same time!");
 
     /*
      * check if message is coming from file
@@ -342,11 +362,11 @@ do_cache:
 
        /* read folder and create message structure */
        if (!(mp = folder_read (folder, 1)))
-           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++)
@@ -385,7 +405,7 @@ do_cache:
     if (!*cts)
        done (1);
 
-    userrs = 1;
+    userrs = true;
     SIGNAL (SIGQUIT, quitser);
     SIGNAL (SIGPIPE, pipeser);