OK, this should work to detect Sun Studio cc.

[nmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index cc15a0f122489a201cf24f7cda06ae7c0aad9641..73f15b89211f63feff06be18d3b0eb06380d4ce0 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -2,8 +2,6 @@
 /*
  * sendsbr.c -- routines to help WhatNow/Send along
  *
 /*
  * sendsbr.c -- routines to help WhatNow/Send along
  *

- * $Id$
- *

  * 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.
  * 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.


@@ -12,22 +10,15 @@
 #include <h/mh.h>
 #include <h/signals.h>
 #include <setjmp.h>
 #include <h/mh.h>
 #include <h/signals.h>
 #include <setjmp.h>

-#include <signal.h>

 #include <fcntl.h>
 #include <h/mime.h>
 #include <h/tws.h>
 #include <h/utils.h>
 
 #include <fcntl.h>
 #include <h/mime.h>
 #include <h/tws.h>
 #include <h/utils.h>
 

-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H

 # include <sys/time.h>
 # include <sys/time.h>

-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif

 #endif
 #endif

+#include <time.h>

 
 int debugsw = 0;               /* global */
 int forwsw  = 1;
 
 int debugsw = 0;               /* global */
 int forwsw  = 1;


@@ -41,11 +32,10 @@ char *altmsg   = NULL;              /*  .. */
 char *annotext = NULL;
 char *distfile = NULL;
 
 char *annotext = NULL;
 char *distfile = NULL;
 

-static int armed = 0;

 static jmp_buf env;
 
 static jmp_buf env;
 

-static char    body_file_name[MAXPATHLEN + 1];         /* name of temporary file for body content */
-static char    composition_file_name[MAXPATHLEN + 1];  /* name of mhbuild composition temporary file */
+static char    body_file_name[PATH_MAX + 1];           /* name of temporary file for body content */
+static char    composition_file_name[PATH_MAX + 1];    /* name of mhbuild composition temporary file */

 static int     field_size;                             /* size of header field buffer */
 static char    *field;                                 /* header field buffer */
 static FILE    *draft_file;                            /* draft file pointer */
 static int     field_size;                             /* size of header field buffer */
 static char    *field;                                 /* header field buffer */
 static FILE    *draft_file;                            /* draft file pointer */


@@ -55,24 +45,24 @@ static      FILE    *composition_file;                      /* composition file pointer */
 /*
  * external prototypes
  */
 /*
  * external prototypes
  */

-int sendsbr (char **, int, char *, struct stat *, int, char *, int);
-int done (int);
+int sendsbr (char **, int, char *, char *, struct stat *, int, char *, int);

 char *getusername (void);
 
 /*
  * static prototypes
  */
 char *getusername (void);
 
 /*
  * static prototypes
  */

+static void armed_done (int) NORETURN;

 static void alert (char *, int);
 static int tmp_fd (void);
 static void anno (int, struct stat *);
 static void annoaux (int);
 static void alert (char *, int);
 static int tmp_fd (void);
 static void anno (int, struct stat *);
 static void annoaux (int);

-static int splitmsg (char **, int, char *, struct stat *, int);
-static int sendaux (char **, int, char *, struct stat *);
+static int splitmsg (char **, int, char *, char *, struct stat *, int);
+static int sendaux (char **, int, char *, char *, struct stat *);

 
 static int     attach(char *, char *, int);
 static void    clean_up_temporary_files(void);
 static int     get_line(void);
 
 static int     attach(char *, char *, int);
 static void    clean_up_temporary_files(void);
 static int     get_line(void);

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

 
 
 /*
 
 
 /*


@@ -80,7 +70,8 @@ static        void    make_mime_composition_file_entry(char *, int);
  */
 
 int
  */
 
 int

-sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft, char *attachment_header_field_name, int attachformat)
+sendsbr (char **vec, int vecp, char *program, char *drft, struct stat *st,
+         int rename_drft, char *attachment_header_field_name, int attachformat)

 {
     int status;
     char buffer[BUFSIZ], file[BUFSIZ];
 {
     int status;
     char buffer[BUFSIZ], file[BUFSIZ];


@@ -118,7 +109,7 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft, cha
        }
     }
 
        }
     }
 

-    armed++;
+    done=armed_done;

     switch (setjmp (env)) {
     case OK: 
        /*
     switch (setjmp (env)) {
     case OK: 
        /*


@@ -126,8 +117,11 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft, cha
         * rename the draft file.  I'm not quite sure why.
         */
        if (pushsw && unique) {
         * rename the draft file.  I'm not quite sure why.
         */
        if (pushsw && unique) {

-           if (rename (drft, strncpy (file, m_scratch (drft, invo_name), sizeof(file)))
-                   == NOTOK)
+            char *cp = m_mktemp2(drft, invo_name, NULL, NULL);
+            if (cp == NULL) {
+                adios ("sendsbr", "unable to create temporary file");
+            }
+           if (rename (drft, strncpy(file, cp, sizeof(file))) == NOTOK)

                adios (file, "unable to rename %s to", drft);
            drft = file;
        }
                adios (file, "unable to rename %s to", drft);
            drft = file;
        }


@@ -138,9 +132,9 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft, cha
         */
        if (splitsw >= 0 && !distfile && stat (drft, &sts) != NOTOK
                && sts.st_size >= CPERMSG) {
         */
        if (splitsw >= 0 && !distfile && stat (drft, &sts) != NOTOK
                && sts.st_size >= CPERMSG) {

-           status = splitmsg (vec, vecp, drft, st, splitsw) ? NOTOK : OK;
+           status = splitmsg (vec, vecp, program, drft, st, splitsw) ? NOTOK : OK;

        } else {
        } else {

-           status = sendaux (vec, vecp, drft, st) ? NOTOK : OK;
+           status = sendaux (vec, vecp, program, drft, st) ? NOTOK : OK;

        }
 
        /* rename the original draft */
        }
 
        /* rename the original draft */


@@ -154,7 +148,7 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft, cha
        break;
     }
 
        break;
     }
 

-    armed = 0;
+    done=exit;

     if (distfile)
        unlink (distfile);
 
     if (distfile)
        unlink (distfile);
 


@@ -192,12 +186,13 @@ static    int
 attach(char *attachment_header_field_name, char *draft_file_name,
        int attachformat)
 {
 attach(char *attachment_header_field_name, char *draft_file_name,
        int attachformat)
 {

-    char               buf[MAXPATHLEN + 6];    /* miscellaneous buffer */
+    char               buf[PATH_MAX + 6];      /* miscellaneous buffer */

     int                        c;                      /* current character for body copy */
     int                        has_attachment;         /* draft has at least one attachment */
     int                        has_body;               /* draft has a message body */
     int                        length;                 /* length of attachment header field name */
     char               *p;                     /* miscellaneous string pointer */
     int                        c;                      /* current character for body copy */
     int                        has_attachment;         /* draft has at least one attachment */
     int                        has_body;               /* draft has a message body */
     int                        length;                 /* length of attachment header field name */
     char               *p;                     /* miscellaneous string pointer */

+    FILE               *fp;                    /* pointer for mhn.defaults */

 
     /*
      * Open up the draft file.
 
     /*
      * Open up the draft file.


@@ -214,19 +209,27 @@ attach(char *attachment_header_field_name, char *draft_file_name,
     field = (char *)mh_xmalloc(field_size = 256);
 
     /*
     field = (char *)mh_xmalloc(field_size = 256);
 
     /*

-     * Scan the draft file for a header field name that matches the -attach
-     * argument.  The existence of one indicates that the draft has attachments.
-     * Bail out if there are no attachments because we're done.  Read to the
-     * end of the headers even if we have no attachments.
+     * Scan the draft file for a header field name, with a non-empty
+     * body, that matches the -attach argument.  The existence of one
+     * indicates that the draft has attachments.  Bail out if there
+     * are no attachments because we're done.  Read to the end of the
+     * headers even if we have no attachments.

      */
 
     length = strlen(attachment_header_field_name);
 
     has_attachment = 0;
 
      */
 
     length = strlen(attachment_header_field_name);
 
     has_attachment = 0;
 

-    while (get_line() != EOF && *field != '\0' && *field != '-')
-       if (strncasecmp(field, attachment_header_field_name, length) == 0 && field[length] == ':')
-           has_attachment = 1;
+    while (get_line() != EOF && *field != '\0' && *field != '-') {
+       if (strncasecmp(field, attachment_header_field_name, length) == 0 &&
+           field[length] == ':') {
+           for (p = field + length + 1; *p == ' ' || *p == '\t'; p++)
+               ;
+           if (strlen (p) > 0) {
+               has_attachment = 1;
+           }
+       }
+    }

 
     if (has_attachment == 0)
        return (DONE);
 
     if (has_attachment == 0)
        return (DONE);


@@ -254,8 +257,12 @@ attach(char *attachment_header_field_name, char *draft_file_name,
      * Make names for the temporary files.
      */
 
      * Make names for the temporary files.
      */
 

-    (void)strncpy(body_file_name, m_scratch("", m_maildir(invo_name)), sizeof (body_file_name));
-    (void)strncpy(composition_file_name, m_scratch("", m_maildir(invo_name)), sizeof (composition_file_name));
+    (void)strncpy(body_file_name,
+                  m_mktemp(m_maildir(invo_name), NULL, NULL),
+                  sizeof (body_file_name));
+    (void)strncpy(composition_file_name,
+                  m_mktemp(m_maildir(invo_name), NULL, NULL),
+                  sizeof (composition_file_name));

 
     if (has_body)
        body_file = fopen(body_file_name, "w");
 
     if (has_body)
        body_file = fopen(body_file_name, "w");


@@ -268,14 +275,16 @@ attach(char *attachment_header_field_name, char *draft_file_name,
     }
 
     /*
     }
 
     /*

-     * Start at the beginning of the draft file.  Copy all non-attachment header fields
-     * to the temporary composition file.  Then add the dashed line separator.
+     * Start at the beginning of the draft file.  Copy all
+     * non-attachment header fields to the temporary composition
+     * file.  Then add the dashed line separator.

      */
 
     rewind(draft_file);
 
     while (get_line() != EOF && *field != '\0' && *field != '-')
      */
 
     rewind(draft_file);
 
     while (get_line() != EOF && *field != '\0' && *field != '-')

-       if (strncasecmp(field, attachment_header_field_name, length) != 0 || field[length] != ':')
+       if (strncasecmp(field, attachment_header_field_name, length) != 0 ||
+            field[length] != ':')

            (void)fprintf(composition_file, "%s\n", field);
 
     (void)fputs("--------\n", composition_file);
            (void)fprintf(composition_file, "%s\n", field);
 
     (void)fputs("--------\n", composition_file);


@@ -293,32 +302,58 @@ attach(char *attachment_header_field_name, char *draft_file_name,
 
     /*
      * Add a mhbuild MIME composition file line for the body if there was one.
 
     /*
      * Add a mhbuild MIME composition file line for the body if there was one.

+     *  Set the default content type to text/plain so that mhbuild takes care
+     *  of any necessary encoding.

      */
 
     if (has_body)
      */
 
     if (has_body)

-       make_mime_composition_file_entry(body_file_name, attachformat);
+       make_mime_composition_file_entry(body_file_name, attachformat,
+                                        "text/plain");

 
     /*
 
     /*

-     * Now, go back to the beginning of the draft file and look for header fields
-     * that specify attachments.  Add a mhbuild MIME composition file for each.
+     * Now, go back to the beginning of the draft file and look for
+     * header fields that specify attachments.  Add a mhbuild MIME
+     * composition file for each.

      */
 
      */
 

+    if ((fp = fopen (p = etcpath ("mhn.defaults"), "r"))) {
+       readconfig ((struct node **) NULL, fp, p, 0);
+       fclose(fp);
+    }
+

     rewind(draft_file);
 
     while (get_line() != EOF && *field != '\0' && *field != '-') {
     rewind(draft_file);
 
     while (get_line() != EOF && *field != '\0' && *field != '-') {

-       if (strncasecmp(field, attachment_header_field_name, length) == 0 && field[length] == ':') {
+       if (strncasecmp(field, attachment_header_field_name, length) == 0 &&
+            field[length] == ':') {

            for (p = field + length + 1; *p == ' ' || *p == '\t'; p++)
                ;
 
            for (p = field + length + 1; *p == ' ' || *p == '\t'; p++)
                ;
 

-           make_mime_composition_file_entry(p, attachformat);
+           /* Skip empty attachment_header_field_name lines. */
+           if (strlen (p) > 0) {
+               struct stat st;
+               if (stat (p, &st) == OK) {
+                   if (S_ISREG (st.st_mode)) {
+                     /* Don't set the default content type so take
+                        make_mime_composition_file_entry() will try
+                        to infer it from the file type. */
+                       make_mime_composition_file_entry(p, attachformat, 0);
+                   } else {
+                       adios (NULL, "unable to attach %s, not a plain file",
+                              p);
+                   }
+               } else {
+                 adios (NULL, "unable to access file \"%s\"", p);
+               }
+           }

        }
     }
 
     (void)fclose(composition_file);
 
     /*
        }
     }
 
     (void)fclose(composition_file);
 
     /*

-     * We're ready to roll!  Run mhbuild on the composition file.  Note that mhbuild
-     * is in the context as buildmimeproc.
+     * We're ready to roll!  Run mhbuild on the composition file.
+     * Note that mhbuild is in the context as buildmimeproc.

      */
 
     (void)sprintf(buf, "%s %s", buildmimeproc, composition_file_name);
      */
 
     (void)sprintf(buf, "%s %s", buildmimeproc, composition_file_name);


@@ -378,18 +413,19 @@ get_line(void)
 }
 
 static void
 }
 
 static void

-make_mime_composition_file_entry(char *file_name, int attachformat)
+make_mime_composition_file_entry(char *file_name, int attachformat,
+                                 char *default_content_type)

 {
     int                        binary;                 /* binary character found flag */
     int                        c;                      /* current character */
 {
     int                        binary;                 /* binary character found flag */
     int                        c;                      /* current character */

-    char               cmd[MAXPATHLEN + 6];    /* file command buffer */
+    char               cmd[PATH_MAX + 6];      /* file command buffer */

     char               *content_type;          /* mime content type */
     FILE               *fp;                    /* content and pipe file pointer */
     struct     node    *np;                    /* context scan node pointer */
     char               *p;                     /* miscellaneous string pointer */
     struct     stat    st;                     /* file status buffer */
 
     char               *content_type;          /* mime content type */
     FILE               *fp;                    /* content and pipe file pointer */
     struct     node    *np;                    /* context scan node pointer */
     char               *p;                     /* miscellaneous string pointer */
     struct     stat    st;                     /* file status buffer */
 

-    content_type = (char *)0;
+    content_type = default_content_type;

 
     /*
      * Check the file name for a suffix.  Scan the context for that suffix on a
 
     /*
      * Check the file name for a suffix.  Scan the context for that suffix on a


@@ -401,7 +437,8 @@ make_mime_composition_file_entry(char *file_name, int attachformat)
 
     if ((p = strrchr(file_name, '.')) != (char *)0) {
        for (np = m_defs; np; np = np->n_next) {
 
     if ((p = strrchr(file_name, '.')) != (char *)0) {
        for (np = m_defs; np; np = np->n_next) {

-           if (strncasecmp(np->n_name, "mhshow-suffix-", 14) == 0 && strcasecmp(p, np->n_field) == 0) {
+           if (strncasecmp(np->n_name, "mhshow-suffix-", 14) == 0 &&
+                strcasecmp(p, np->n_field ? np->n_field : "") == 0) {

                content_type = np->n_name + 14;
                break;
            }
                content_type = np->n_name + 14;
                break;
            }


@@ -452,7 +489,7 @@ make_mime_composition_file_entry(char *file_name, int attachformat)
         (void)fprintf(composition_file, "#%s; name=\"%s\"; x-unix-mode=0%.3ho",
             content_type, ((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1, (unsigned short)(st.st_mode & 0777));
 
         (void)fprintf(composition_file, "#%s; name=\"%s\"; x-unix-mode=0%.3ho",
             content_type, ((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1, (unsigned short)(st.st_mode & 0777));
 

-        if (strlen(file_name) > MAXPATHLEN) {
+        if (strlen(file_name) > PATH_MAX) {

             clean_up_temporary_files();
             adios((char *)0, "attachment file name `%s' too long.", file_name);
         }
             clean_up_temporary_files();
             adios((char *)0, "attachment file name `%s' too long.", file_name);
         }


@@ -489,17 +526,53 @@ make_mime_composition_file_entry(char *file_name, int attachformat)
 
         break;
     case 1:
 
         break;
     case 1:

-        /* Suppress Content-Id, insert simple Content-Disposition. */
-        (void) fprintf (composition_file, "#%s <>{attachment}", content_type);
+        if (stringdex (m_maildir(invo_name), file_name) == 0) {
+            /* Content had been placed by send into a temp file.
+               Don't generate Content-Disposition header, because
+               it confuses Microsoft Outlook, Build 10.0.6626, at
+               least. */
+            (void) fprintf (composition_file, "#%s <>", content_type);
+        } else {
+            /* Suppress Content-Id, insert simple Content-Disposition
+               and Content-Description with filename.
+               The Content-Disposition type needs to be "inline" for
+               MS Outlook and BlackBerry calendar programs to properly
+               handle a text/calendar attachment. */
+            p = strrchr(file_name, '/');
+            (void) fprintf (composition_file,
+                            "#%s; name=\"%s\" <> [%s]{%s}",
+                            content_type,
+                            (p == (char *)0) ? file_name : p + 1,
+                            (p == (char *)0) ? file_name : p + 1,
+                            strcmp ("text/calendar", content_type)
+                              ? "attachment" : "inline");
+        }

 
         break;
     case 2:
 
         break;
     case 2:

-        /* Suppress Content-Id, insert Content-Disposition with
-           modification date. */
-        (void) fprintf (composition_file,
-                        "#%s <>{attachment; modification-date=\"%s\"}",
-                        content_type,
-                        dtime (&st.st_mtime, 0));
+        if (stringdex (m_maildir(invo_name), file_name) == 0) {
+            /* Content had been placed by send into a temp file.
+               Don't generate Content-Disposition header, because
+               it confuses Microsoft Outlook, Build 10.0.6626, at
+               least. */
+            (void) fprintf (composition_file, "#%s <>", content_type);
+        } else {
+            /* Suppress Content-Id, insert Content-Disposition with
+               modification date and Content-Description wtih filename.
+               The Content-Disposition type needs to be "inline" for
+               MS Outlook and BlackBerry calendar programs to properly
+               handle a text/calendar attachment. */
+            p = strrchr(file_name, '/');
+            (void) fprintf (composition_file,
+                            "#%s; name=\"%s\" <>[%s]{%s; "
+                            "modification-date=\"%s\"}",
+                            content_type,
+                            (p == (char *)0) ? file_name : p + 1,
+                            (p == (char *)0) ? file_name : p + 1,
+                            strcmp ("text/calendar", content_type)
+                              ? "attachment" : "inline",
+                            dtime (&st.st_mtime, 0));
+        }

 
         break;
     default:
 
         break;
     default:


@@ -521,7 +594,8 @@ make_mime_composition_file_entry(char *file_name, int attachformat)
  */
 
 static int
  */
 
 static int

-splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
+splitmsg (char **vec, int vecp, char *program, char *drft,
+         struct stat *st, int delay)

 {
     int        compnum, nparts, partno, state, status;
     long pos, start;
 {
     int        compnum, nparts, partno, state, status;
     long pos, start;


@@ -530,6 +604,7 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
     char subject[BUFSIZ];
     char name[NAMESZ], partnum[BUFSIZ];
     FILE *in;
     char subject[BUFSIZ];
     char name[NAMESZ], partnum[BUFSIZ];
     FILE *in;

+    m_getfld_state_t gstate = 0;

 
     if ((in = fopen (drft, "r")) == NULL)
        adios (drft, "unable to open for reading");
 
     if ((in = fopen (drft, "r")) == NULL)
        adios (drft, "unable to open for reading");


@@ -541,19 +616,22 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
      * Scan through the message and examine the various header fields,
      * as well as locate the beginning of the message body.
      */
      * Scan through the message and examine the various header fields,
      * as well as locate the beginning of the message body.
      */

-    for (compnum = 1, state = FLD;;) {
-       switch (state = m_getfld (state, name, buffer, sizeof(buffer), in)) {
+    m_getfld_track_filepos (&gstate, in);
+    for (compnum = 1;;) {
+       int bufsz = sizeof buffer;
+       switch (state = m_getfld (&gstate, name, buffer, &bufsz, in)) {

            case FLD:
            case FLDPLUS:
            case FLD:
            case FLDPLUS:

-           case FLDEOF:

                compnum++;
 
                /*
                 * This header field is discarded.
                 */
                if (!strcasecmp (name, "Message-ID")) {
                compnum++;
 
                /*
                 * This header field is discarded.
                 */
                if (!strcasecmp (name, "Message-ID")) {

-                   while (state == FLDPLUS)
-                       state = m_getfld (state, name, buffer, sizeof(buffer), in);
+                   while (state == FLDPLUS) {
+                       bufsz = sizeof buffer;
+                       state = m_getfld (&gstate, name, buffer, &bufsz, in);
+                   }

                } else if (uprf (name, XXX_FIELD_PRF)
                        || !strcasecmp (name, VRSN_FIELD)
                        || !strcasecmp (name, "Subject")
                } else if (uprf (name, XXX_FIELD_PRF)
                        || !strcasecmp (name, VRSN_FIELD)
                        || !strcasecmp (name, "Subject")


@@ -577,7 +655,8 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
 
                    dp = add (concat (name, ":", buffer, NULL), dp);
                    while (state == FLDPLUS) {
 
                    dp = add (concat (name, ":", buffer, NULL), dp);
                    while (state == FLDPLUS) {

-                       state = m_getfld (state, name, buffer, sizeof(buffer), in);
+                       bufsz = sizeof buffer;
+                       state = m_getfld (&gstate, name, buffer, &bufsz, in);

                        dp = add (buffer, dp);
                    }
                } else {
                        dp = add (buffer, dp);
                    }
                } else {


@@ -587,19 +666,16 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
                     */
                    cp = add (concat (name, ":", buffer, NULL), cp);
                    while (state == FLDPLUS) {
                     */
                    cp = add (concat (name, ":", buffer, NULL), cp);
                    while (state == FLDPLUS) {

-                       state = m_getfld (state, name, buffer, sizeof(buffer), in);
+                       bufsz = sizeof buffer;
+                       state = m_getfld (&gstate, name, buffer, &bufsz, in);

                        cp = add (buffer, cp);
                    }
                }
 
                        cp = add (buffer, cp);
                    }
                }
 

-               if (state != FLDEOF) {
-                   start = ftell (in) + 1;
-                   continue;
-               }
-               /* else fall... */
+               start = ftell (in) + 1;
+               continue;

 
           case BODY:
 
           case BODY:

-          case BODYEOF:

           case FILEEOF:
                break;
 
           case FILEEOF:
                break;
 


@@ -613,6 +689,7 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
 
        break;
     }
 
        break;
     }

+    m_getfld_state_destroy (&gstate);

     if (cp == NULL)
        adios (NULL, "headers missing from draft");
 
     if (cp == NULL)
        adios (NULL, "headers missing from draft");
 


@@ -634,7 +711,7 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
            free (dp);
 
        fclose (in);
            free (dp);
 
        fclose (in);

-       return sendaux (vec, vecp, drft, st);
+       return sendaux (vec, vecp, program, drft, st);

     }
 
     if (!pushsw) {
     }
 
     if (!pushsw) {


@@ -649,17 +726,18 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
        vec[vecp++] = "-queued";
 
     time (&clock);
        vec[vecp++] = "-queued";
 
     time (&clock);

-    snprintf (msgid, sizeof(msgid), "<%d.%ld@%s>",
-               (int) getpid(), (long) clock, LocalName());
+    snprintf (msgid, sizeof(msgid), "%s", message_id (clock, 0));

 
     fseek (in, start, SEEK_SET);
     for (partno = 1; partno <= nparts; partno++) {
        char tmpdrf[BUFSIZ];
        FILE *out;
 
 
     fseek (in, start, SEEK_SET);
     for (partno = 1; partno <= nparts; partno++) {
        char tmpdrf[BUFSIZ];
        FILE *out;
 

-       strncpy (tmpdrf, m_scratch (drft, invo_name), sizeof(tmpdrf));
-       if ((out = fopen (tmpdrf, "w")) == NULL)
-           adios (tmpdrf, "unable to open for writing");
+       char *cp = m_mktemp2(drft, invo_name, NULL, &out);
+        if (cp == NULL) {
+           adios (drft, "unable to create temporary file for");
+        }
+       strncpy(tmpdrf, cp, sizeof(tmpdrf));

        chmod (tmpdrf, 0600);
 
        /*
        chmod (tmpdrf, 0600);
 
        /*


@@ -723,7 +801,7 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
        }
 
        snprintf (partnum, sizeof(partnum), "%d", partno);
        }
 
        snprintf (partnum, sizeof(partnum), "%d", partno);

-       status = sendaux (vec, vecp, tmpdrf, st);
+       status = sendaux (vec, vecp, program, tmpdrf, st);

        unlink (tmpdrf);
        if (status != OK)
            break;
        unlink (tmpdrf);
        if (status != OK)
            break;


@@ -746,11 +824,11 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
 
 /*
  * Annotate original message, and
 
 /*
  * Annotate original message, and

- * call `postproc' to send message.
+ * call `postproc' (which is passed down in "program") to send message.

  */
 
 static int
  */
 
 static int

-sendaux (char **vec, int vecp, char *drft, struct stat *st)
+sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st)

 {
     pid_t child_id;
     int i, status, fd, fd2;
 {
     pid_t child_id;
     int i, status, fd, fd2;


@@ -773,7 +851,7 @@ sendaux (char **vec, int vecp, char *drft, struct stat *st)
        done (1);
     vec[vecp] = NULL;
 
        done (1);
     vec[vecp] = NULL;
 

-    for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
+    for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)

        sleep (5);
 
     switch (child_id) {
        sleep (5);
 
     switch (child_id) {


@@ -794,11 +872,10 @@ sendaux (char **vec, int vecp, char *drft, struct stat *st)
            dup2 (fd, fileno (stderr));
            close (fd);
        }
            dup2 (fd, fileno (stderr));
            close (fd);
        }

-       execvp (postproc, vec);
+       execvp (program, vec);

        fprintf (stderr, "unable to exec ");
        perror (postproc);
        _exit (-1);
        fprintf (stderr, "unable to exec ");
        perror (postproc);
        _exit (-1);

-       break;  /* NOT REACHED */

 
     default:
        /*
 
     default:
        /*


@@ -843,8 +920,10 @@ static void
 alert (char *file, int out)
 {
     pid_t child_id;
 alert (char *file, int out)
 {
     pid_t child_id;

-    int i, in;
+    int i, in, argp;

     char buf[BUFSIZ];
     char buf[BUFSIZ];

+    char *program;
+    char **arglist;

 
     for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
        sleep (5);
 
     for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
        sleep (5);


@@ -884,8 +963,14 @@ alert (char *file, int out)
            snprintf (buf, sizeof(buf), "send failed on %s",
                        forwsw ? "enclosed draft" : file);
 
            snprintf (buf, sizeof(buf), "send failed on %s",
                        forwsw ? "enclosed draft" : file);
 

-           execlp (mailproc, r1bindex (mailproc, '/'), getusername (),
-                   "-subject", buf, NULL);
+           arglist = argsplit(mailproc, &program, &argp);
+
+           arglist[argp++] = getusername();
+           arglist[argp++] = "-subject";
+           arglist[argp++] = buf;
+           arglist[argp] = NULL;
+
+           execvp (program, arglist);

            fprintf (stderr, "unable to exec ");
            perror (mailproc);
            _exit (-1);
            fprintf (stderr, "unable to exec ");
            perror (mailproc);
            _exit (-1);


@@ -900,16 +985,17 @@ static int
 tmp_fd (void)
 {
     int fd;
 tmp_fd (void)
 {
     int fd;

-    char tmpfil[BUFSIZ];
+    char *tfile = NULL;
+
+    tfile = m_mktemp2(NULL, invo_name, &fd, NULL);
+    if (tfile == NULL) return NOTOK;
+    fchmod(fd, 0600);

 
 

-    strncpy (tmpfil, m_tmpfil (invo_name), sizeof(tmpfil));
-    if ((fd = open (tmpfil, O_RDWR | O_CREAT | O_TRUNC, 0600)) == NOTOK)
-       return NOTOK;

     if (debugsw)
     if (debugsw)

-       advise (NULL, "temporary file %s selected", tmpfil);
+       advise (NULL, "temporary file %s selected", tfile);

     else
     else

-       if (unlink (tmpfil) == NOTOK)
-           advise (tmpfil, "unable to remove");
+       if (unlink (tfile) == NOTOK)
+           advise (tfile, "unable to remove");

 
     return fd;
 }
 
     return fd;
 }


@@ -949,14 +1035,14 @@ anno (int fd, struct stat *st)
            sigaddset (&set, SIGINT);
            sigaddset (&set, SIGQUIT);
            sigaddset (&set, SIGTERM);
            sigaddset (&set, SIGINT);
            sigaddset (&set, SIGQUIT);
            sigaddset (&set, SIGTERM);

-           SIGPROCMASK (SIG_BLOCK, &set, &oset);
+           sigprocmask (SIG_BLOCK, &set, &oset);

 
            annoaux (fd);
            if (child_id == OK)
                _exit (0);
 
            /* reset the signal mask */
 
            annoaux (fd);
            if (child_id == OK)
                _exit (0);
 
            /* reset the signal mask */

-           SIGPROCMASK (SIG_SETMASK, &oset, &set);
+           sigprocmask (SIG_SETMASK, &oset, &set);

 
            chdir (cwd);
            break;
 
            chdir (cwd);
            break;


@@ -988,9 +1074,9 @@ annoaux (int fd)
            admonish (maildir, "unable to change directory to");
        return;
     }
            admonish (maildir, "unable to change directory to");
        return;
     }

-    if (!(mp = folder_read (folder))) {
+    if (!(mp = folder_read (folder, 0))) {

        if (debugsw)
        if (debugsw)

-           admonish (NULL, "unable to read folder %s");
+           admonish (NULL, "unable to read folder %s", folder);

        return;
     }
 
        return;
     }
 


@@ -1055,12 +1141,8 @@ oops:
 }
 
 
 }
 
 

-int
-done (int status)
+static void
+armed_done (int status)

 {
 {

-    if (armed)
-       longjmp (env, status ? status : NOTOK);
-
-    exit (status);
-    return 1;  /* dead code to satisfy the compiler */
+    longjmp (env, status ? status : NOTOK);

 }
 }