X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/207d657cf4495be3eb44ccde94e807692665f5e2..554a14bdf3eea0b2dc68aa68b99c7294528e1d30:/uip/sendsbr.c?ds=inline

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index dfd974f4..e3a8195f 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 */
@@ -582,7 +583,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,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;
+    m_getfld_state_t gstate = 0;
 
     if ((in = fopen (drft, "r")) == NULL)
 	adios (drft, "unable to open for reading");
@@ -602,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.
      */
-    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 FLDEOF:
 	        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")
@@ -638,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) {
-			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 {
@@ -648,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) {
-			state = m_getfld (state, name, buffer, sizeof(buffer), in);
+			bufsz = sizeof buffer;
+			state = m_getfld (&gstate, name, buffer, &bufsz, in);
 			cp = add (buffer, cp);
 		    }
 		}
 
-		if (state != FLDEOF) {
-		    start = ftell (in) + 1;
-		    continue;
-		}
-		/* else fall... */
+		start = ftell (in) + 1;
+		continue;
 
 	   case BODY:
-	   case BODYEOF:
 	   case FILEEOF:
 		break;
 
@@ -674,6 +678,7 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
 
 	break;
     }
+    m_getfld_state_destroy (&gstate);
     if (cp == NULL)
 	adios (NULL, "headers missing from draft");
 
@@ -695,7 +700,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) {
@@ -785,7 +790,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;
@@ -808,11 +813,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;
@@ -835,7 +840,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) {
@@ -856,7 +861,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);
@@ -905,8 +910,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);
@@ -946,8 +953,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);