Add basic support for the STLS command in POP

[nmh] / uip / anno.c

diff --git a/uip/anno.c b/uip/anno.c
index 1c4e0caead95924dab8a63e7076b8a23defdd34f..5e3b0a235e6d89a4483bf4bc2849abbae1728dea 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -41,8 +41,28 @@
  *     value of 1 is assumed if this argument is absent.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "annosbr.h"
+#include "sbr/m_name.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_setcur.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/trimcpy.h"
+#include "sbr/m_draft.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/error.h"
+#include "h/utils.h"
 #include "h/done.h"
 #include "sbr/m_maildir.h"
 
@@ -94,7 +114,7 @@ main (int argc, char **argv)
     bool       list;                   /* list header elements if set */
     int                number = 0;             /* delete specific number of like elements if set */
 
-    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;
@@ -108,7 +128,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]",
@@ -121,9 +141,9 @@ main (int argc, char **argv)
 
                case COMPSW:
                    if (comp)
-                       adios (NULL, "only one component at a time!");
+                       die("only one component at a time!");
                    if (!(comp = *argp++) || *comp == '-')
-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);
                    continue;
 
                case DATESW:
@@ -142,9 +162,9 @@ main (int argc, char **argv)
 
                case TEXTSW:
                    if (text)
-                       adios (NULL, "only one body at a time!");
+                       die("only one body at a time!");
                    if (!(text = *argp++) || *text == '-')
-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);
                    continue;
 
                case DELETESW:          /* delete annotations */
@@ -161,7 +181,7 @@ main (int argc, char **argv)
 
                case NUMBERSW:          /* number listing or delete by number */
                    if (number != 0)
-                       adios (NULL, "only one number at a time!");
+                       die("only one number at a time!");
 
                    if (argp - arguments == argc - 1 || **argp == '-')
                        number = 1;
@@ -171,7 +191,7 @@ main (int argc, char **argv)
                            number = -1;
 
                        else if (!(number = atoi(*argp)))
-                           adios (NULL, "missing argument to %s", argp[-1]);
+                           die("missing argument to %s", argp[-1]);
 
                        argp++;
                    }
@@ -194,7 +214,7 @@ main (int argc, char **argv)
        }
        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);
@@ -208,7 +228,7 @@ main (int argc, char **argv)
 
     if (draft != NULL) {
        if (msgs.size != 0)
-           adios(NULL, "can only have message numbers or -draft.");
+           die("can only have message numbers or -draft.");
 
        draft = mh_xstrdup(m_draft(folder, NULL, 1, &isdf));
 
@@ -236,11 +256,11 @@ main (int argc, char **argv)
 
     /* 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++)
@@ -274,7 +294,7 @@ make_comp (char **ap)
     char *cp, buffer[BUFSIZ];
 
     if (*ap == NULL) {
-       printf ("Enter component name: ");
+       fputs("Enter component name: ", stdout);
        fflush (stdout);
 
        if (fgets (buffer, sizeof buffer, stdin) == NULL)
@@ -285,13 +305,13 @@ make_comp (char **ap)
     if ((cp = *ap + strlen (*ap) - 1) > *ap && *cp == ':')
        *cp = 0;
     if (!**ap)
-       adios (NULL, "null component name");
+       die("null component name");
     if (**ap == '-')
-       adios (NULL, "invalid component name %s", *ap);
+       die("invalid component name %s", *ap);
     if (strlen (*ap) >= NAMESZ)
-       adios (NULL, "too large component name %s", *ap);
+       die("too large component name %s", *ap);
 
     for (cp = *ap; *cp; cp++)
        if (!isalnum ((unsigned char) *cp) && *cp != '-')
-           adios (NULL, "invalid component name %s", *ap);
+           die("invalid component name %s", *ap);
 }