push();
}
status = 0;
- vec[0] = mhbasename(postproc);
+ vec[0] = "spost";
closefds(3);
for (msgnum = 0; msgnum < nfiles; msgnum++) {
fclose(body_file);
/* Add a mhbuild MIME composition file line for the body */
- /* charset will be discovered/guessed by buildmimeproc */
+ /* charset will be discovered/guessed by mhbuild */
fprintf(composition_file, "#text/plain %s\n", body_file_name);
}
}
fclose(composition_file);
- /*
- ** We're ready to roll! Run mhbuild on the composition file.
- ** Note that mhbuild is in the context as buildmimeproc.
- */
- sprintf(buf, "%s %s", buildmimeproc, composition_file_name);
-
+ /* We're ready to roll! */
+ sprintf(buf, "mhbuild %s", composition_file_name);
if (system(buf) != 0) {
/* some problem */
clean_up_temporary_files();
/*
** The back-end of the message sending back-end.
-** Annotate original message, and call `postproc' to send message.
+** Annotate original message, and call `spost' to send message.
*/
static int
sendaux(char **vec, int vecp, char *drft, struct stat *st)
{
pid_t child_id;
- int i, status, fd;
+ int status, fd;
char backup[BUFSIZ];
/*
- ** fd collects the output of postproc, and is used for the
+ ** fd collects the output of spost, and is used for the
** failure notice if we need to send one in alert().
*/
fd = pushsw ? tmp_fd() : NOTOK;
}
vec[vecp] = NULL;
- for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) {
- sleep(5);
- }
- switch (child_id) {
+ switch (child_id = fork()) {
case -1:
/* oops -- fork error */
adios("fork", "unable to");
dup2(fd, fileno(stderr));
close(fd);
}
- execvp(postproc, vec);
+ execvp(*vec, vec);
fprintf(stderr, "unable to exec ");
- perror(postproc);
+ perror(*vec);
_exit(-1);
break; /* NOT REACHED */
}
} else {
/*
- ** If postproc failed, and we have good fd (which
+ ** If spost failed, and we have good fd (which
** means we pushed), then mail error message
** (and possibly the draft) back to the user.
*/
/*
** Mail error notification (and possibly a copy of the
-** message) back to the user, using the mailproc
+** message) back to the user, using mhmail(1).
*/
static void
alert(char *file, int out)
{
pid_t child_id;
- int i, in;
+ int in;
char buf[BUFSIZ];
- for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) {
- sleep(5);
- }
-
- switch (child_id) {
+ switch (child_id = fork()) {
case NOTOK:
/* oops -- fork error */
advise("fork", "unable to");
/* create subject for error notification */
snprintf(buf, sizeof(buf), "send failed on %s",
forwsw ? "enclosed draft" : file);
-
- execlp(mailproc, mhbasename(mailproc), getusername(),
+ execlp("mhmail", "mhmail", getusername(),
"-subject", buf, NULL);
fprintf(stderr, "unable to exec ");
- perror(mailproc);
+ perror("mhmail");
_exit(-1);
default: /* no waiting... */