Removed the mhlproc profile entry. Call mhl directly.

[mmh] / uip / repl.c

diff --git a/uip/repl.c b/uip/repl.c
index 5943857..dff8a9e 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -424,7 +424,7 @@ replout(FILE *inb, char *msg, char *drft, struct msgs *mp,
        umask(mask);
 
        /* get new format string */
-       cp = new_fs(form, NULL, NULL, NULL);
+       cp = new_fs(form, NULL);
        format_len = strlen(cp);
 
        /* compile format string */
@@ -596,7 +596,7 @@ finished:
 
                snprintf(buffer, sizeof buffer, "+%s %s",
                                mp->foldpath, m_name(mp->lowsel));
-               annotate(drft, attach_hdr, buffer, 0, -2, 1);
+               annotate(drft, attach_hdr, buffer, 0, -2, 1, 0);
        }
 
        /* return dynamically allocated buffers */
@@ -755,16 +755,14 @@ insert(struct mailname *np)
 
 
 /*
-** Call the mhlproc
+** Call mhl
 **
 ** This function expects that argument out has been fflushed by the caller.
 */
-
 static void
 replfilter(FILE *in, FILE *out, char *filter)
 {
        int pid;
-       char *mhl;
        char *errstr;
 
        if (filter == NULL)
@@ -773,8 +771,6 @@ replfilter(FILE *in, FILE *out, char *filter)
        if (access(filter, R_OK) == NOTOK)
                adios(filter, "unable to read");
 
-       mhl = mhbasename(mhlproc);
-
        rewind(in);
        lseek(fileno(in), (off_t) 0, SEEK_SET);
 
@@ -787,17 +783,15 @@ replfilter(FILE *in, FILE *out, char *filter)
                dup2(fileno(out), fileno(stdout));
                closefds(3);
 
-               execlp(mhlproc, mhl, "-form", filter, "-noclear", NULL);
+               execlp("mhl", "mhl", "-form", filter, NULL);
                errstr = strerror(errno);
-               write(2, "unable to exec ", 15);
-               write(2, mhlproc, strlen(mhlproc));
-               write(2, ": ", 2);
+               write(2, "unable to exec mhl: ", 20);
                write(2, errstr, strlen(errstr));
                write(2, "\n", 1);
                _exit(-1);
 
        default:
-               if (pidXwait(pid, mhl))
+               if (pidXwait(pid, "mhl"))
                        done(1);
                fseek(out, 0L, SEEK_END);
                break;