closefds() doesn't seem relevant or large enough to be a function.

[mmh] / uip / repl.c

diff --git a/uip/repl.c b/uip/repl.c
index efc2b54..3c9e483 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -149,12 +149,12 @@ main(int argc, char **argv)
        struct msgs *mp = NULL;
        FILE *in;
 
-       filter = getcpy(etcpath(mhlreply));
-
 #ifdef MHE
        int buildsw = 0;
 #endif /* MHE */
 
+       filter = getcpy(etcpath(mhlreply));
+
 #ifdef LOCALE
        setlocale(LC_ALL, "");
 #endif
@@ -594,9 +594,13 @@ finished:
                /* add an attachment header */
                char buffer[BUFSIZ];
 
-               snprintf(buffer, sizeof buffer, "+%s %s",
-                               mp->foldpath, m_name(mp->lowsel));
-               annotate(drft, attach_hdr, buffer, 0, -2, 1);
+               snprintf(buffer, sizeof buffer, "anno -append -nodate '%s' "
+                               "-comp '%s' -text '+%s %s'",
+                               drft,
+                               attach_hdr, mp->foldpath, m_name(mp->lowsel));
+               if (system(buffer) != 0) {
+                       advise(NULL, "unable to add attachment header");
+               }
        }
 
        /* return dynamically allocated buffers */
@@ -755,16 +759,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;
+       int pid, n;
        char *errstr;
 
        if (filter == NULL)
@@ -773,8 +775,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);
 
@@ -785,19 +785,19 @@ replfilter(FILE *in, FILE *out, char *filter)
        case OK:
                dup2(fileno(in), fileno(stdin));
                dup2(fileno(out), fileno(stdout));
-               closefds(3);
+               for (n=3; n<OPEN_MAX; n++) {
+                       close(n);
+               }
 
-               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;