Alter HasSuffixC()'s char * to be const.

[nmh] / uip / post.c

diff --git a/uip/post.c b/uip/post.c
index 488d49b7109641285c9249ff26d0395cca5b9b4b..553a22587932930c34750a1efdaf166ebd2246f6 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -64,8 +64,6 @@
     X("library directory", -7, LIBSW) /* interface from send, whom */ \
     X("mime", 0, MIMESW) \
     X("nomime", 0, NMIMESW) \
     X("library directory", -7, LIBSW) /* interface from send, whom */ \
     X("mime", 0, MIMESW) \
     X("nomime", 0, NMIMESW) \

-    X("eai", 0, EAISW) \
-    X("noeai", 0, NEAISW) \

     X("msgid", 0, MSGDSW) \
     X("nomsgid", 0, NMSGDSW) \
     X("verbose", 0, VERBSW) \
     X("msgid", 0, MSGDSW) \
     X("nomsgid", 0, NMSGDSW) \
     X("verbose", 0, VERBSW) \


@@ -85,7 +83,6 @@
     X("partno", -6, PARTSW) \
     X("sasl", SASLminc(4), SASLSW) \
     X("nosasl", SASLminc(6), NOSASLSW) \
     X("partno", -6, PARTSW) \
     X("sasl", SASLminc(4), SASLSW) \
     X("nosasl", SASLminc(6), NOSASLSW) \

-    X("saslmaxssf", SASLminc(10), SASLMXSSFSW) \

     X("saslmech", SASLminc(5), SASLMECHSW) \
     X("user", SASLminc(-4), USERSW) \
     X("port server submission port name/number", 4, PORTSW) \
     X("saslmech", SASLminc(5), SASLMECHSW) \
     X("user", SASLminc(-4), USERSW) \
     X("port server submission port name/number", 4, PORTSW) \


@@ -159,6 +156,8 @@ struct headers {
 #define        HDCC  0x0400    /* another undocumented feature                       */
 #define HONE  0x0800   /* Only (zero or) one address allowed                 */
 #define HEFM  0x1000   /* Envelope-From: header                              */
 #define        HDCC  0x0400    /* another undocumented feature                       */
 #define HONE  0x0800   /* Only (zero or) one address allowed                 */
 #define HEFM  0x1000   /* Envelope-From: header                              */

+#define HMIM  0x2000    /* MIME-Version: header                               */
+#define HCTE  0x4000    /* Content-Transfer-Encoding: header                  */

 
 /*
  * flags for headers->set
 
 /*
  * flags for headers->set


@@ -171,7 +170,7 @@ struct headers {
 #define MSND  0x0020   /* we've seen a Sender:      */
 #define MRSN  0x0040   /* We've seen a Resent-Sendr:*/
 #define MEFM  0x0080   /* We've seen Envelope-From: */
 #define MSND  0x0020   /* we've seen a Sender:      */
 #define MRSN  0x0040   /* We've seen a Resent-Sendr:*/
 #define MEFM  0x0080   /* We've seen Envelope-From: */

-
+#define MMIM  0x0100    /* We've seen Mime-Version:  */

 
 static struct headers NHeaders[] = {
     { "Return-Path",   HBAD,                0 },
 
 static struct headers NHeaders[] = {
     { "Return-Path",   HBAD,                0 },


@@ -188,6 +187,8 @@ static struct headers NHeaders[] = {
     { "Message-ID",    HBAD,                0 },
     { "Fcc",           HFCC,                0 },
     { "Envelope-From", HADR|HONE|HEFM,      MEFM },
     { "Message-ID",    HBAD,                0 },
     { "Fcc",           HFCC,                0 },
     { "Envelope-From", HADR|HONE|HEFM,      MEFM },

+    { "MIME-Version",  HMIM,                MMIM },
+    { "Content-Transfer-Encoding",  HCTE,   0 },

     { NULL,            0,                   0 }
 };
 
     { NULL,            0,                   0 }
 };
 


@@ -211,6 +212,8 @@ static struct headers RHeaders[] = {
     { "Bcc",               HADR|HTRY|HBCC|HNIL, 0 },
     { "Fcc",               HIGN,                0 },
     { "Envelope-From",     HADR|HONE|HEFM,      MEFM },
     { "Bcc",               HADR|HTRY|HBCC|HNIL, 0 },
     { "Fcc",               HIGN,                0 },
     { "Envelope-From",     HADR|HONE|HEFM,      MEFM },

+    { "MIME-Version",      HMIM,                MMIM },
+    { "Content-Transfer-Encoding",  HCTE,       0 },

     { NULL,                0,                   0 }
 };
 
     { NULL,                0,                   0 }
 };
 


@@ -225,7 +228,6 @@ static int badmsg = 0;              /* message has bad semantics             */
 static int verbose = 0;                /* spell it out                          */
 static int format = 1;         /* format addresses                      */
 static int mime = 0;           /* use MIME-style encapsulations for Bcc */
 static int verbose = 0;                /* spell it out                          */
 static int format = 1;         /* format addresses                      */
 static int mime = 0;           /* use MIME-style encapsulations for Bcc */

-static int eai = 0;            /* use EAI (SMTPUTF8)                    */

 static int msgid = 0;          /* add msgid                             */
 static int debug = 0;          /* debugging post                        */
 static int watch = 0;          /* watch the delivery process            */
 static int msgid = 0;          /* add msgid                             */
 static int debug = 0;          /* debugging post                        */
 static int watch = 0;          /* watch the delivery process            */


@@ -234,7 +236,6 @@ static int checksw = 0;             /* whom -check                           */
 static int linepos=0;          /* putadr()'s position on the line       */
 static int nameoutput=0;       /* putadr() has output header name       */
 static int sasl=0;             /* Use SASL auth for SMTP                */
 static int linepos=0;          /* putadr()'s position on the line       */
 static int nameoutput=0;       /* putadr() has output header name       */
 static int sasl=0;             /* Use SASL auth for SMTP                */

-static int saslssf=-1;         /* Our maximum SSF for SASL              */

 static char *saslmech=NULL;    /* Force use of particular SASL mech     */
 static char *user=NULL;                /* Authenticate as this user             */
 static char *port="submission";        /* Name of server port for SMTP submission */
 static char *saslmech=NULL;    /* Force use of particular SASL mech     */
 static char *user=NULL;                /* Authenticate as this user             */
 static char *port="submission";        /* Name of server port for SMTP submission */


@@ -262,6 +263,8 @@ static char fullfrom[BUFSIZ];       /* full contents of From header  */
 static char *filter = NULL;    /* the filter for BCC'ing        */
 static char *subject = NULL;   /* the subject field for BCC'ing */
 static char *fccfold[FCCS];    /* foldernames for FCC'ing       */
 static char *filter = NULL;    /* the filter for BCC'ing        */
 static char *subject = NULL;   /* the subject field for BCC'ing */
 static char *fccfold[FCCS];    /* foldernames for FCC'ing       */

+enum encoding { UNKNOWN = 0, BINARY = 1, SEVENBIT = 7, EIGHTBIT = 8 };
+static enum encoding cte = UNKNOWN;

 
 static struct headers  *hdrtab;        /* table for the message we're doing */
 
 
 static struct headers  *hdrtab;        /* table for the message we're doing */
 


@@ -281,7 +284,7 @@ static char *partno = NULL;
 /*
  * static prototypes
  */
 /*
  * static prototypes
  */

-static void putfmt (char *, char *, FILE *);
+static void putfmt (char *, char *, int *, FILE *);

 static void start_headers (void);
 static void finish_headers (FILE *);
 static int get_header (char *, struct headers *);
 static void start_headers (void);
 static void finish_headers (FILE *);
 static int get_header (char *, struct headers *);


@@ -293,14 +296,14 @@ static void anno (void);
 static int annoaux (struct mailname *);
 static void insert_fcc (struct headers *, char *);
 static void make_bcc_file (int);
 static int annoaux (struct mailname *);
 static void insert_fcc (struct headers *, char *);
 static void make_bcc_file (int);

-static void verify_all_addresses (int, char *, int, char *);
+static void verify_all_addresses (int, int, char *, int, char *);

 static void chkadr (void);
 static void sigon (void);
 static void sigoff (void);
 static void p_refile (char *);
 static void fcc (char *, char *);
 static void die (char *, char *, ...);
 static void chkadr (void);
 static void sigon (void);
 static void sigoff (void);
 static void p_refile (char *);
 static void fcc (char *, char *);
 static void die (char *, char *, ...);

-static void post (char *, int, int, char *, int, char *);
+static void post (char *, int, int, int, char *, int, char *);

 static void do_text (char *file, int fd);
 static void do_an_address (struct mailname *, int);
 static void do_addresses (int, int);
 static void do_text (char *file, int fd);
 static void do_an_address (struct mailname *, int);
 static void do_addresses (int, int);


@@ -311,6 +314,7 @@ int
 main (int argc, char **argv)
 {
     int state, compnum, dashstuff = 0, swnum, oauth_flag = 0;
 main (int argc, char **argv)
 {
     int state, compnum, dashstuff = 0, swnum, oauth_flag = 0;

+    int eai = 0; /* use Email Address Internationalization (EAI) (SMTPUTF8) */

     char *cp, *msg = NULL, **argp, **arguments, *envelope;
     char buf[BUFSIZ], name[NAMESZ], *auth_svc = NULL;
     FILE *in, *out;
     char *cp, *msg = NULL, **argp, **arguments, *envelope;
     char buf[BUFSIZ], name[NAMESZ], *auth_svc = NULL;
     FILE *in, *out;


@@ -401,13 +405,6 @@ main (int argc, char **argv)
                    mime = 0;
                    continue;
 
                    mime = 0;
                    continue;
 

-               case EAISW:
-                   eai = 1;
-                   continue;
-               case NEAISW:
-                   eai = 0;
-                   continue;
-

                case MSGDSW: 
                    msgid++;
                    continue;
                case MSGDSW: 
                    msgid++;
                    continue;


@@ -472,12 +469,6 @@ main (int argc, char **argv)
                    sasl = 0;
                    continue;
 
                    sasl = 0;
                    continue;
 

-               case SASLMXSSFSW:
-                   if (!(cp = *argp++) || *cp == '-')
-                       adios (NULL, "missing argument to %s", argp[-2]);
-                   saslssf = atoi(cp);
-                   continue;
-               

                case SASLMECHSW:
                    if (!(saslmech = *argp++) || *saslmech == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
                case SASLMECHSW:
                    if (!(saslmech = *argp++) || *saslmech == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);


@@ -595,12 +586,6 @@ main (int argc, char **argv)
     if ((in = fopen (msg, "r")) == NULL)
        adios (msg, "unable to open");
 
     if ((in = fopen (msg, "r")) == NULL)
        adios (msg, "unable to open");
 

-    /* Support EAI. */
-    if (eai) {
-        /* Add eai profile entry, to pass utf-8 setting to getname()/getadrx(). */
-        add_profile_entry ("eai", "utf-8");
-    }
-

     start_headers ();
     if (debug) {
        verbose++;
     start_headers ();
     if (debug) {
        verbose++;


@@ -626,14 +611,14 @@ main (int argc, char **argv)
        switch (state = m_getfld (&gstate, name, buf, &bufsz, in)) {
            case FLD: 
            case FLDPLUS: 
        switch (state = m_getfld (&gstate, name, buf, &bufsz, in)) {
            case FLD: 
            case FLDPLUS: 

-               compnum++;
+                compnum++;

                cp = add (buf, NULL);
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;
                    state = m_getfld (&gstate, name, buf, &bufsz, in);
                    cp = add (buf, cp);
                }
                cp = add (buf, NULL);
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;
                    state = m_getfld (&gstate, name, buf, &bufsz, in);
                    cp = add (buf, cp);
                }

-               putfmt (name, cp, out);
+               putfmt (name, cp, &eai, out);

                free (cp);
                continue;
 
                free (cp);
                continue;
 


@@ -735,7 +720,7 @@ main (int argc, char **argv)
     /* If we are doing a "whom" check */
     if (whomsw) {
        /* This won't work with MTS_SENDMAIL_PIPE. */
     /* If we are doing a "whom" check */
     if (whomsw) {
        /* This won't work with MTS_SENDMAIL_PIPE. */

-        verify_all_addresses (1, envelope, oauth_flag, auth_svc);
+        verify_all_addresses (1, eai, envelope, oauth_flag, auth_svc);

        done (0);
     }
 
        done (0);
     }
 


@@ -747,14 +732,15 @@ main (int argc, char **argv)
                   verify_all_addresses with MTS_SENDMAIL_PIPE, but
                   that might require running sendmail as root.  Note
                   that spost didn't verify addresses. */
                   verify_all_addresses with MTS_SENDMAIL_PIPE, but
                   that might require running sendmail as root.  Note
                   that spost didn't verify addresses. */

-               verify_all_addresses (verbose, envelope, oauth_flag, auth_svc);
+               verify_all_addresses (verbose, eai, envelope, oauth_flag,
+                                      auth_svc);

            }
            }

-           post (tmpfil, 0, verbose, envelope, oauth_flag, auth_svc);
+           post (tmpfil, 0, verbose, eai, envelope, oauth_flag, auth_svc);

        }
        }

-       post (bccfil, 1, verbose, envelope, oauth_flag, auth_svc);
+       post (bccfil, 1, verbose, eai, envelope, oauth_flag, auth_svc);

        (void) m_unlink (bccfil);
     } else {
        (void) m_unlink (bccfil);
     } else {

-       post (tmpfil, 0, isatty (1), envelope, oauth_flag, auth_svc);
+       post (tmpfil, 0, isatty (1), eai, envelope, oauth_flag, auth_svc);

     }
 
     p_refile (tmpfil);
     }
 
     p_refile (tmpfil);


@@ -777,7 +763,7 @@ main (int argc, char **argv)
  */
 
 static void
  */
 
 static void

-putfmt (char *name, char *str, FILE *out)
+putfmt (char *name, char *str, int *eai, FILE *out)

 {
     int count, grp, i, keep;
     char *cp, *pp, *qp;
 {
     int count, grp, i, keep;
     char *cp, *pp, *qp;


@@ -794,16 +780,31 @@ putfmt (char *name, char *str, FILE *out)
        return;
     }
 
        return;
     }
 

+    if (! *eai) {
+        /* Check each header field value to see if it has any 8-bit characters.
+           If it does, enable EAI support. */
+        if (contains8bit(str, NULL)) {
+            if (verbose) {
+                printf ("EAI/SMTPUTF8 enabled\n");
+            }
+
+            /* Enable SMTPUTF8. */
+            *eai = 1;
+
+            /* Enable passing of utf-8 setting to getname()/getadrx(). */
+            enable_eai();
+        }
+    }
+

     if ((i = get_header (name, hdrtab)) == NOTOK) {
     if ((i = get_header (name, hdrtab)) == NOTOK) {

-       if (strncasecmp (name, "nmh-", 4)) {
+        if (strncasecmp (name, "nmh-", 4)) {

            fprintf (out, "%s: %s", name, str);
        } else {
            /* Filter out all Nmh-* headers, because Norm asked.  They
               should never have reached this point.  Warn about any
               that are non-empty. */
            if (strcmp (str, "\n")) {
            fprintf (out, "%s: %s", name, str);
        } else {
            /* Filter out all Nmh-* headers, because Norm asked.  They
               should never have reached this point.  Warn about any
               that are non-empty. */
            if (strcmp (str, "\n")) {

-               char *newline = strchr (str, '\n');
-               if (newline) *newline = '\0';
+                TrimSuffixC(str, '\n');

                if (! whomsw) {
                    advise (NULL, "ignoring header line -- %s: %s", name, str);
                }
                if (! whomsw) {
                    advise (NULL, "ignoring header line -- %s: %s", name, str);
                }


@@ -825,7 +826,7 @@ putfmt (char *name, char *str, FILE *out)
     msgflags |= (hdr->set & ~(MVIS | MINV));
 
     if (hdr->flags & HSUB)
     msgflags |= (hdr->set & ~(MVIS | MINV));
 
     if (hdr->flags & HSUB)

-       subject = subject ? add (str, add ("\t", subject)) : getcpy (str);
+       subject = subject ? add (str, add ("\t", subject)) : mh_xstrdup(str);

     if (hdr->flags & HFCC) {
        if ((cp = strrchr(str, '\n')))
            *cp = 0;
     if (hdr->flags & HFCC) {
        if ((cp = strrchr(str, '\n')))
            *cp = 0;


@@ -836,14 +837,23 @@ putfmt (char *name, char *str, FILE *out)
        insert_fcc (hdr, pp);
        return;
     }
        insert_fcc (hdr, pp);
        return;
     }

-
+    if (hdr->flags & HCTE) {
+        if (strncasecmp (str, "7bit", 4) == 0) {
+            cte = SEVENBIT;
+        } else if (strncasecmp (str, "8bit", 4) == 0) {
+            cte = EIGHTBIT;
+        } else if (strncasecmp (str, "binary", 6) == 0) {
+            cte = BINARY;
+        }
+    }

     if (!(hdr->flags & HADR)) {
        fprintf (out, "%s: %s", name, str);
        return;
     }
 
     tmpaddrs.m_next = NULL;
     if (!(hdr->flags & HADR)) {
        fprintf (out, "%s: %s", name, str);
        return;
     }
 
     tmpaddrs.m_next = NULL;

-    for (count = 0; (cp = getname (str)); count++)
+
+    for (count = 0; (cp = getname (str)); count++) {

        if ((mp = getm (cp, NULL, 0, error, sizeof(error)))) {
            if (tmpaddrs.m_next)
                np->m_next = mp;
        if ((mp = getm (cp, NULL, 0, error, sizeof(error)))) {
            if (tmpaddrs.m_next)
                np->m_next = mp;


@@ -858,6 +868,7 @@ putfmt (char *name, char *str, FILE *out)
            else
                badmsg++;
        }
            else
                badmsg++;
        }

+    }

 
     if (count < 1) {
        if (hdr->flags & HNIL)
 
     if (count < 1) {
        if (hdr->flags & HNIL)


@@ -1206,7 +1217,7 @@ putadr (char *name, char *aka, struct mailname *mp, FILE *out, unsigned int flag
     }
 
     if (*aka && mp->m_type != UUCPHOST && !mp->m_pers)
     }
 
     if (*aka && mp->m_type != UUCPHOST && !mp->m_pers)

-       mp->m_pers = getcpy (aka);
+       mp->m_pers = mh_xstrdup(aka);

     if (format) {
        if (mp->m_gname) {
            snprintf (buffer, sizeof(buffer), "%s;", mp->m_gname);
     if (format) {
        if (mp->m_gname) {
            snprintf (buffer, sizeof(buffer), "%s;", mp->m_gname);


@@ -1322,7 +1333,7 @@ pl (void)
     printf ("\n\t-- Folder Copies --\nfcc:\t");
     for (i = 0; i < fccind; i++)
        printf ("%s%s", fccfold[i], i + 1 < fccind ? ",\n\t" : "");
     printf ("\n\t-- Folder Copies --\nfcc:\t");
     for (i = 0; i < fccind; i++)
        printf ("%s%s", fccfold[i], i + 1 < fccind ? ",\n\t" : "");

-    printf ("\n");
+    putchar('\n');

 }
 
 
 }
 
 


@@ -1378,7 +1389,7 @@ insert_fcc (struct headers *hdr, char *pp)
 
     if (fccind >= FCCS)
        adios (NULL, "too many %ss", hdr->value);
 
     if (fccind >= FCCS)
        adios (NULL, "too many %ss", hdr->value);

-    fccfold[fccind++] = getcpy (cp);
+    fccfold[fccind++] = mh_xstrdup(cp);

 }
 
 /*
 }
 
 /*


@@ -1601,10 +1612,9 @@ do_addresses (int bccque, int talk)
  */
 
 static void
  */
 
 static void

-post (char *file, int bccque, int talk, char *envelope, int oauth_flag,
-      char *auth_svc)
+post (char *file, int bccque, int talk, int eai, char *envelope,
+      int oauth_flag, char *auth_svc)

 {
 {

-    int fd;

     int        retval, i;
     pid_t child_id;
 
     int        retval, i;
     pid_t child_id;
 


@@ -1650,17 +1660,33 @@ post (char *file, int bccque, int talk, char *envelope, int oauth_flag,
                break;
        }
     } else {
                break;
        }
     } else {

+        const int fd = open (file, O_RDONLY);
+        int eightbit = 0;
+
+        if (fd == NOTOK) {
+          die (file, "unable to re-open");
+        }
+
+        if (msgflags & MMIM  &&  cte != UNKNOWN) {
+            /* MIME message with C-T-E header.  (BINARYMIME isn't
+               supported, use 8BITMIME instead for binary.) */
+            eightbit = cte != SEVENBIT;
+        } else {
+            if (scan_input (fd, &eightbit) == NOTOK) {
+                close (fd);
+                die (file, "problem reading from");
+            }
+        }
+

        if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,
        if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,

-                                       verbose, snoop, sasl, saslssf,
-                                       saslmech, user,
+                                       verbose, snoop, sasl, saslmech, user,

                                        oauth_flag ? auth_svc : NULL, tls))
                                        oauth_flag ? auth_svc : NULL, tls))

-            || rp_isbad (retval = sm_winit (envelope, eai))) {
+               || rp_isbad (retval = sm_winit (envelope, eai, eightbit))) {
+           close (fd);

            die (NULL, "problem initializing server; %s", rp_string (retval));
        }
 
         do_addresses (bccque, talk && verbose);
            die (NULL, "problem initializing server; %s", rp_string (retval));
        }
 
         do_addresses (bccque, talk && verbose);

-        if ((fd = open (file, O_RDONLY)) == NOTOK)
-          die (file, "unable to re-open");

         do_text (file, fd);
         close (fd);
         fflush (stdout);
         do_text (file, fd);
         close (fd);
         fflush (stdout);


@@ -1684,7 +1710,8 @@ post (char *file, int bccque, int talk, char *envelope, int oauth_flag,
 /* Address Verification */
 
 static void
 /* Address Verification */
 
 static void

-verify_all_addresses (int talk, char *envelope, int oauth_flag, char *auth_svc)
+verify_all_addresses (int talk, int eai, char *envelope, int oauth_flag,
+                      char *auth_svc)

 {
     int retval;
     struct mailname *lp;
 {
     int retval;
     struct mailname *lp;


@@ -1692,11 +1719,13 @@ verify_all_addresses (int talk, char *envelope, int oauth_flag, char *auth_svc)
     sigon ();
 
     if (!whomsw || checksw) {
     sigon ();
 
     if (!whomsw || checksw) {

+        /* Not sending message body, so don't need to use 8BITMIME. */
+        const int eightbit = 0;
+

        if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,
        if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch,

-                                       verbose, snoop, sasl, saslssf,
-                                       saslmech, user,
+                                       verbose, snoop, sasl, saslmech, user,

                                        oauth_flag ? auth_svc : NULL, tls))
                                        oauth_flag ? auth_svc : NULL, tls))

-               || rp_isbad (retval = sm_winit (envelope, eai))) {
+               || rp_isbad (retval = sm_winit (envelope, eai, eightbit))) {

            die (NULL, "problem initializing server; %s", rp_string (retval));
        }
     }
            die (NULL, "problem initializing server; %s", rp_string (retval));
        }
     }