Hardcoded mhmail instead of mailproc.

[mmh] / uip / send.c

diff --git a/uip/send.c b/uip/send.c
index 6fcccad..51661a5 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -485,7 +485,7 @@ attach(char *draft_file_name)
                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);
        }
 
@@ -512,11 +512,8 @@ attach(char *draft_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();
@@ -620,7 +617,7 @@ 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];
 
        /*
@@ -635,10 +632,7 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
        }
        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");
@@ -697,20 +691,16 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 
 /*
 ** 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");
@@ -745,10 +735,10 @@ alert(char *file, int out)
                /* 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... */