Removed hard-coded locking selection from SPECS/nmh.spec.

[nmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 08dc7666ec4e19d929d9ea991d6ff11af311a820..e3a8195f01ed10a189b384fefed794a73f98d173 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -46,7 +46,7 @@ static        FILE    *composition_file;                      /* composition file pointer */
 /*
  * external prototypes
  */
 /*
  * external prototypes
  */

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

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


@@ -57,8 +57,8 @@ static void alert (char *, int);
 static int tmp_fd (void);
 static void anno (int, struct stat *);
 static void annoaux (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     attach(char *, char *, int);
 static void    clean_up_temporary_files(void);


@@ -71,7 +71,8 @@ static        void    make_mime_composition_file_entry(char *, int, char *);
  */
 
 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];


@@ -132,9 +133,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 */


@@ -209,19 +210,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);


@@ -267,14 +276,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);


@@ -301,8 +312,9 @@ attach(char *attachment_header_field_name, char *draft_file_name,
                                         "text/plain");
 
     /*
                                         "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"))) {
      */
 
     if ((fp = fopen (p = etcpath ("mhn.defaults"), "r"))) {


@@ -313,22 +325,36 @@ attach(char *attachment_header_field_name, char *draft_file_name,
     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++)
                ;
 

-           /* 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);
+           /* 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);


@@ -557,7 +583,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;


@@ -566,6 +593,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");


@@ -577,19 +605,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 (!mh_strcasecmp (name, "Message-ID")) {
                compnum++;
 
                /*
                 * This header field is discarded.
                 */
                if (!mh_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)
                        || !mh_strcasecmp (name, VRSN_FIELD)
                        || !mh_strcasecmp (name, "Subject")
                } else if (uprf (name, XXX_FIELD_PRF)
                        || !mh_strcasecmp (name, VRSN_FIELD)
                        || !mh_strcasecmp (name, "Subject")


@@ -613,7 +644,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 {


@@ -623,19 +655,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;
 


@@ -649,6 +678,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");
 


@@ -670,7 +700,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) {


@@ -760,7 +790,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;


@@ -783,11 +813,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;


@@ -810,7 +840,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) {


@@ -831,7 +861,7 @@ 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);


@@ -880,8 +910,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);


@@ -921,8 +953,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);