Add basic support for the STLS command in POP

[nmh] / uip / viamail.c

diff --git a/uip/viamail.c b/uip/viamail.c
index 0ff765c4273d84b334c245f1c55a0058a7647aec..7ec3808ac8979b61727a0ca0f3b2e59a30dc0399 100644 (file)
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -1,20 +1,32 @@
-
-/*
- * viamail.c -- send multiple files in a MIME message
+/* viamail.c -- send multiple files in a MIME message
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sendsbr.h"
+#include "sbr/m_gmprot.h"
+#include "sbr/getarguments.h"
+#include "sbr/concat.h"
+#include "sbr/smatch.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/arglist.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/mime.h>
-#include <h/mhparse.h>
+#include "h/md5.h"
+#include "h/mts.h"
+#include "h/tws.h"
+#include "h/mime.h"
+#include "h/mhparse.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/m_mktemp.h"
+#include "sbr/base64.h"
 
 #define VIAMAIL_SWITCHES \
     X("to mailpath", 0, TOSW) \
@@ -40,7 +52,7 @@ DEFINE_SWITCH_ARRAY(VIAMAIL, switches);
 
 extern int debugsw;
 extern int splitsw;
-extern int verbsw;
+extern bool verbsw;
 
 /*
  * static prototypes
@@ -57,7 +69,7 @@ main (int argc, char **argv)
     char *cp, buf[BUFSIZ];
     char **argp, **arguments;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 0);
     argp = arguments;
@@ -69,7 +81,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 [switches]", invo_name);
@@ -81,27 +93,27 @@ main (int argc, char **argv)
     
            case TOSW:
                if (!(f1 = *argp++))
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                continue;
            case SUBJECTSW:
                if (!(f2 = *argp++))
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                continue;
            case PARAMSW:
                if (!(f3 = *argp++))
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                continue;
            case DESCRIPTSW:
                if (!(f4 = *argp++))
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                continue;
            case COMMENTSW:
                if (!(f5 = *argp++))
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                continue;
            case DELAYSW:
                if (!(cp = *argp++) || *cp == '-')
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
 
                /*
                 * If there is an error, just reset the delay parameter
@@ -112,14 +124,14 @@ main (int argc, char **argv)
                continue;
            case FROMSW:
                if (!(f7 = *argp++))
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                continue;
 
            case VERBSW: 
-               verbsw = 1;
+               verbsw = true;
                continue;
            case NVERBSW: 
-               verbsw = 0;
+               verbsw = false;
                continue;
 
            case DEBUGSW:
@@ -130,7 +142,7 @@ main (int argc, char **argv)
     }
 
     if (!f1)
-       adios (NULL, "missing -viamail \"mailpath\" switch");
+       die("missing -viamail \"mailpath\" switch");
 
     via_mail (f1, f2, f3, f4, f5, delay, f7);
     return 0;  /* dead code to satisfy the compiler */
@@ -156,7 +168,7 @@ via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw,
     umask (~m_gmprot ());
 
     if ((tfile = m_mktemp2(NULL, invo_name, NULL, &fp)) == NULL) {
-       adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+       die("unable to create temporary file in %s", get_temp_dir());
     }
     strncpy (tmpfil, tfile, sizeof(tmpfil));
 
@@ -214,7 +226,7 @@ via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw,
        vec[vecp++] = cp;
     }
 
-    switch (sendsbr (vec, vecp, program, tmpfil, &st, 0)) {
+    switch (sendsbr (vec, vecp, program, tmpfil, &st, 0, NULL)) {
        case DONE:
        case NOTOK:
            status++;