Remove autoconf checks for nl_langinfo() and langinfo.h

[nmh] / uip / send.c

diff --git a/uip/send.c b/uip/send.c
index 510047a0de293da44a51fdf7b49e6e3f7037a8ca..be5dc79364a024e46317a46bee68ead02100b85d 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -9,8 +9,6 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
-#include <errno.h>
-#include <signal.h>
 
 
 #ifndef CYRUS_SASL
@@ -69,6 +67,7 @@
     X("attachformat", 7, ATTACHFORMATSW) \
     X("port server-port-name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \
+    X("initialtls", TLSminc(-10), INITTLSSW) \
     X("notls", TLSminc(-5), NTLSSW) \
     X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
     X("messageid localname|random", 2, MESSAGEIDSW) \
@@ -121,9 +120,7 @@ main (int argc, char **argv)
     char *attach = NMH_ATTACH_HEADER;  /* header field name for attachments */
     int attachformat = 1; /* mhbuild format specifier for attachments */
 
-#ifdef LOCALE
     setlocale(LC_ALL, "");
-#endif
     invo_name = r1bindex (argv[0], '/');
 
     /* read user profile/context */
@@ -138,13 +135,19 @@ main (int argc, char **argv)
     vec[vecp++] = getcpy (m_maildir (""));
 
     if ((cp = context_find ("fileproc"))) {
-      vec[vecp++] = "-fileproc";
-      vec[vecp++] = cp;
+       vec[vecp++] = "-fileproc";
+       vec[vecp++] = cp;
     }
 
     if ((cp = context_find ("mhlproc"))) {
-      vec[vecp++] = "-mhlproc";
-      vec[vecp++] = cp;
+       vec[vecp++] = "-mhlproc";
+       vec[vecp++] = cp;
+    }
+
+    if ((cp = context_find ("credentials"))) {
+       /* post doesn't read context so need to pass credentials. */
+       vec[vecp++] = "-credentials";
+       vec[vecp++] = cp;
     }
 
     while ((cp = *argp++)) {
@@ -245,6 +248,7 @@ main (int argc, char **argv)
                case SASLSW:
                case NOSASLSW:
                case TLSSW:
+               case INITTLSSW:
                case NTLSSW:
                    vec[vecp++] = --cp;
                    continue;
@@ -308,12 +312,6 @@ main (int argc, char **argv)
 
     if (dfolder == NULL) {
        if (msgp == 0) {
-#ifdef WHATNOW
-           if ((cp = getenv ("mhdraft")) && *cp) {
-               msgs[msgp++] = cp;
-               goto go_to_it;
-           }
-#endif /* WHATNOW */
            msgs[msgp++] = getcpy (m_draft (NULL, NULL, 1, &isdf));
            if (stat (msgs[0], &st) == NOTOK)
                adios (msgs[0], "unable to stat draft file");
@@ -350,7 +348,7 @@ main (int argc, char **argv)
            adios (maildir, "unable to change directory to");
 
        /* read folder and create message structure */
-       if (!(mp = folder_read (dfolder)))
+       if (!(mp = folder_read (dfolder, 1)))
            adios (NULL, "unable to read folder %s", dfolder);
 
        /* check for empty folder */