Add new signal include file location for El Capitan. I am not sure

[nmh] / uip / send.c

diff --git a/uip/send.c b/uip/send.c
index 7c0827856e65b43e1fabcfdba3bc478a1a452433..f4c4910673a9552c941504a60839ded959b3a5ba 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -9,8 +9,6 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
 
 #include <h/mh.h>
 #include <fcntl.h>

-#include <errno.h>
-#include <signal.h>

 
 
 #ifndef CYRUS_SASL
 
 
 #ifndef CYRUS_SASL


@@ -56,10 +54,6 @@
     X("help", 0, HELPSW) \
     X("dashstuffing", -12, BITSTUFFSW) \
     X("nodashstuffing", -14, NBITSTUFFSW) \
     X("help", 0, HELPSW) \
     X("dashstuffing", -12, BITSTUFFSW) \
     X("nodashstuffing", -14, NBITSTUFFSW) \

-    X("mail", -4, MAILSW) \
-    X("saml", -4, SAMLSW) \
-    X("send", -4, SENDSW) \
-    X("soml", -4, SOMLSW) \

     X("client host", -6, CLIESW) \
     X("server host", 6, SERVSW) \
     X("snoop", 5, SNOOPSW) \
     X("client host", -6, CLIESW) \
     X("server host", 6, SERVSW) \
     X("snoop", 5, SNOOPSW) \


@@ -68,12 +62,14 @@
     X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
     X("saslmech mechanism", SASLminc(-5), SASLMECHSW) \
     X("user username", SASLminc(-4), USERSW) \
     X("saslmaxssf", SASLminc(-10), SASLMXSSFSW) \
     X("saslmech mechanism", SASLminc(-5), SASLMECHSW) \
     X("user username", SASLminc(-4), USERSW) \

-    X("attach", 6, ATTACHSW) \
-    X("noattach", 0, NOATTACHSW) \
+    X("attach", -6, ATTACHSW) \
+    X("noattach", -8, NOATTACHSW) \

     X("attachformat", 7, ATTACHFORMATSW) \
     X("port server-port-name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \
     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("notls", TLSminc(-5), NTLSSW) \

+    X("sendmail program", 0, MTSSM) \

     X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
     X("messageid localname|random", 2, MESSAGEIDSW) \
 
     X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
     X("messageid localname|random", 2, MESSAGEIDSW) \
 


@@ -122,16 +118,8 @@ main (int argc, char **argv)
     char *msgs[MAXARGS], **vec;
     struct msgs *mp;
     struct stat st;
     char *msgs[MAXARGS], **vec;
     struct msgs *mp;
     struct stat st;

-    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 */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -142,13 +130,19 @@ main (int argc, char **argv)
     vec[vecp++] = getcpy (m_maildir (""));
 
     if ((cp = context_find ("fileproc"))) {
     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"))) {
     }
 
     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++)) {
     }
 
     while ((cp = *argp++)) {


@@ -245,14 +239,11 @@ main (int argc, char **argv)
                case NMSGDSW: 
                case WATCSW: 
                case NWATCSW: 
                case NMSGDSW: 
                case WATCSW: 
                case NWATCSW: 

-               case MAILSW: 
-               case SAMLSW: 
-               case SENDSW: 
-               case SOMLSW: 

                case SNOOPSW: 
                case SASLSW:
                case NOSASLSW:
                case TLSSW:
                case SNOOPSW: 
                case SASLSW:
                case NOSASLSW:
                case TLSSW:

+               case INITTLSSW:

                case NTLSSW:
                    vec[vecp++] = --cp;
                    continue;
                case NTLSSW:
                    vec[vecp++] = --cp;
                    continue;


@@ -266,6 +257,7 @@ main (int argc, char **argv)
                case SASLMXSSFSW:
                case USERSW:
                case PORTSW:
                case SASLMXSSFSW:
                case USERSW:
                case PORTSW:

+               case MTSSM:

                case MTSSW:
                case MESSAGEIDSW:
                    vec[vecp++] = --cp;
                case MTSSW:
                case MESSAGEIDSW:
                    vec[vecp++] = --cp;


@@ -275,26 +267,14 @@ main (int argc, char **argv)
                    continue;
                
                case ATTACHSW:
                    continue;
                
                case ATTACHSW:

-                   if (!(attach = *argp++) || *attach == '-')
-                       adios (NULL, "missing argument to %s", argp[-2]);
+                   advise(NULL, "The -attach switch is deprecated");

                    continue;
                case NOATTACHSW:
                    continue;
                case NOATTACHSW:

-                   attach = NULL;
+                   advise(NULL, "The -noattach switch is deprecated");

                    continue;
 
                case ATTACHFORMATSW:
                    continue;
 
                case ATTACHFORMATSW:

-                   if (! *argp || **argp == '-')
-                       adios (NULL, "missing argument to %s", argp[-1]);
-                   else {
-                       attachformat = atoi (*argp);
-                       if (attachformat < 0 ||
-                           attachformat > ATTACHFORMATS - 1) {
-                           advise (NULL, "unsupported attachformat %d",
-                                   attachformat);
-                           continue;
-                       }
-                   }
-                   ++argp;
+                   advise(NULL, "The -attachformat switch is deprecated");

                    continue;
            }
        } else {
                    continue;
            }
        } else {


@@ -316,18 +296,12 @@ main (int argc, char **argv)
 
     if (dfolder == NULL) {
        if (msgp == 0) {
 
     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");
            cp = concat ("Use \"", msgs[0], "\"? ", NULL);
            for (status = LISTDSW; status != YESW;) {
            msgs[msgp++] = getcpy (m_draft (NULL, NULL, 1, &isdf));
            if (stat (msgs[0], &st) == NOTOK)
                adios (msgs[0], "unable to stat draft file");
            cp = concat ("Use \"", msgs[0], "\"? ", NULL);
            for (status = LISTDSW; status != YESW;) {

-               if (!(argp = getans (cp, anyl)))
+               if (!(argp = read_switch_multiword (cp, anyl)))

                    done (1);
                switch (status = smatch (*argp, anyl)) {
                    case NOSW: 
                    done (1);
                switch (status = smatch (*argp, anyl)) {
                    case NOSW: 


@@ -358,7 +332,7 @@ main (int argc, char **argv)
            adios (maildir, "unable to change directory to");
 
        /* read folder and create message structure */
            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 */
            adios (NULL, "unable to read folder %s", dfolder);
 
        /* check for empty folder */


@@ -406,8 +380,12 @@ go_to_it:
            && (distsw = atoi (cp))
            && altmsg) {
        vec[vecp++] = "-dist";
            && (distsw = atoi (cp))
            && altmsg) {
        vec[vecp++] = "-dist";

-       distfile = getcpy (m_mktemp2 (altmsg, invo_name, NULL, NULL));
-       unlink(distfile);
+       if ((cp = m_mktemp2(altmsg, invo_name, NULL, NULL)) == NULL) {
+           adios(NULL, "unable to create temporary file in %s",
+                 get_temp_dir());
+       }
+       distfile = getcpy (cp);
+       (void) m_unlink(distfile);

        if (link (altmsg, distfile) == NOTOK) {
            /* Cygwin with FAT32 filesystem produces EPERM. */
            if (errno != EXDEV  &&  errno != EPERM
        if (link (altmsg, distfile) == NOTOK) {
            /* Cygwin with FAT32 filesystem produces EPERM. */
            if (errno != EXDEV  &&  errno != EPERM


@@ -417,7 +395,11 @@ go_to_it:
                )
                adios (distfile, "unable to link %s to", altmsg);
            free (distfile);
                )
                adios (distfile, "unable to link %s to", altmsg);
            free (distfile);

-           distfile = getcpy (m_mktemp2(NULL, invo_name, NULL, NULL));
+           if ((cp = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+               adios(NULL, "unable to create temporary file in %s",
+                     get_temp_dir());
+           }
+           distfile = getcpy (cp);

            {
                int in, out;
                struct stat st;
            {
                int in, out;
                struct stat st;


@@ -448,8 +430,7 @@ go_to_it:
     closefds (3);
 
     for (msgnum = 0; msgnum < msgp; msgnum++) {
     closefds (3);
 
     for (msgnum = 0; msgnum < msgp; msgnum++) {

-       switch (sendsbr (vec, vecp, program, msgs[msgnum], &st, 1, attach,
-                        attachformat)) {
+       switch (sendsbr (vec, vecp, program, msgs[msgnum], &st, 1)) {

            case DONE: 
                done (++status);
            case NOTOK: 
            case DONE: 
                done (++status);
            case NOTOK: