X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/adc0a3232c43033729dbc036f0757bddfba463bd..a6a073be4aea5e0a1ca2e55920d0f97c8a5f273a:/uip/sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index d8fc9c7a..10b5f9bd 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -46,7 +46,7 @@ static	FILE	*composition_file;			/* composition file pointer */
 /*
  * 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);
 
 /*
@@ -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 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);
@@ -71,7 +71,8 @@ static	void	make_mime_composition_file_entry(char *, int, char *);
  */
 
 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];
@@ -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) {
-	    status = splitmsg (vec, vecp, drft, st, splitsw) ? NOTOK : OK;
+	    status = splitmsg (vec, vecp, program, drft, st, splitsw) ? NOTOK : OK;
 	} else {
-	    status = sendaux (vec, vecp, drft, st) ? NOTOK : OK;
+	    status = sendaux (vec, vecp, program, drft, st) ? NOTOK : OK;
 	}
 
 	/* rename the original draft */
@@ -437,7 +438,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 (strncasecmp(np->n_name, "mhshow-suffix-", 14) == 0 && mh_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;
 	    }
@@ -582,7 +584,8 @@ make_mime_composition_file_entry(char *file_name, int attachformat,
  */
 
 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;
@@ -591,7 +594,7 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
     char subject[BUFSIZ];
     char name[NAMESZ], partnum[BUFSIZ];
     FILE *in;
-    m_getfld_state_t gstate;
+    m_getfld_state_t gstate = 0;
 
     if ((in = fopen (drft, "r")) == NULL)
 	adios (drft, "unable to open for reading");
@@ -603,10 +606,10 @@ 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.
      */
-    m_getfld_state_init (&gstate);
+    m_getfld_track_filepos (&gstate, in);
     for (compnum = 1;;) {
 	int bufsz = sizeof buffer;
-	switch (state = m_getfld (gstate, name, buffer, &bufsz, in)) {
+	switch (state = m_getfld (&gstate, name, buffer, &bufsz, in)) {
 	    case FLD:
 	    case FLDPLUS:
 	        compnum++;
@@ -614,15 +617,15 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
 		/*
 		 * This header field is discarded.
 		 */
-		if (!mh_strcasecmp (name, "Message-ID")) {
+		if (!strcasecmp (name, "Message-ID")) {
 		    while (state == FLDPLUS) {
 			bufsz = sizeof buffer;
-			state = m_getfld (gstate, name, buffer, &bufsz, in);
+			state = m_getfld (&gstate, name, buffer, &bufsz, in);
 		    }
 		} else if (uprf (name, XXX_FIELD_PRF)
-			|| !mh_strcasecmp (name, VRSN_FIELD)
-			|| !mh_strcasecmp (name, "Subject")
-		        || !mh_strcasecmp (name, "Encrypted")) {
+			|| !strcasecmp (name, VRSN_FIELD)
+			|| !strcasecmp (name, "Subject")
+		        || !strcasecmp (name, "Encrypted")) {
 		    /*
 		     * These header fields are copied to the enclosed
 		     * header of the first message in the collection
@@ -631,7 +634,7 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
 		     * version of it, can be copied to the header
 		     * of each messsage/partial in the collection.
 		     */
-		    if (!mh_strcasecmp (name, "Subject")) {
+		    if (!strcasecmp (name, "Subject")) {
 			size_t sublen;
 
 			strncpy (subject, buffer, BUFSIZ);
@@ -643,7 +646,7 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
 		    dp = add (concat (name, ":", buffer, NULL), dp);
 		    while (state == FLDPLUS) {
 			bufsz = sizeof buffer;
-			state = m_getfld (gstate, name, buffer, &bufsz, in);
+			state = m_getfld (&gstate, name, buffer, &bufsz, in);
 			dp = add (buffer, dp);
 		    }
 		} else {
@@ -654,7 +657,7 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
 		    cp = add (concat (name, ":", buffer, NULL), cp);
 		    while (state == FLDPLUS) {
 			bufsz = sizeof buffer;
-			state = m_getfld (gstate, name, buffer, &bufsz, in);
+			state = m_getfld (&gstate, name, buffer, &bufsz, in);
 			cp = add (buffer, cp);
 		    }
 		}
@@ -698,7 +701,7 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
 	    free (dp);
 
 	fclose (in);
-	return sendaux (vec, vecp, drft, st);
+	return sendaux (vec, vecp, program, drft, st);
     }
 
     if (!pushsw) {
@@ -788,7 +791,7 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
 	}
 
 	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;
@@ -811,11 +814,11 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
 
 /*
  * Annotate original message, and
- * call `postproc' to send message.
+ * call `postproc' (which is passed down in "program") to send message.
  */
 
 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;
@@ -838,7 +841,7 @@ sendaux (char **vec, int vecp, char *drft, struct stat *st)
 	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) {
@@ -859,7 +862,7 @@ sendaux (char **vec, int vecp, char *drft, struct stat *st)
 	    dup2 (fd, fileno (stderr));
 	    close (fd);
 	}
-	execvp (postproc, vec);
+	execvp (program, vec);
 	fprintf (stderr, "unable to exec ");
 	perror (postproc);
 	_exit (-1);
@@ -908,8 +911,10 @@ static void
 alert (char *file, int out)
 {
     pid_t child_id;
-    int i, in;
+    int i, in, argp;
     char buf[BUFSIZ];
+    char *program;
+    char **arglist;
 
     for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
 	sleep (5);
@@ -949,8 +954,14 @@ alert (char *file, int out)
 	    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);
@@ -1054,7 +1065,7 @@ annoaux (int fd)
 	    admonish (maildir, "unable to change directory to");
 	return;
     }
-    if (!(mp = folder_read (folder))) {
+    if (!(mp = folder_read (folder, 0))) {
 	if (debugsw)
 	    admonish (NULL, "unable to read folder %s", folder);
 	return;