Reworked attach to add charset to Content-Type string for

[nmh] / sbr / showfile.c

diff --git a/sbr/showfile.c b/sbr/showfile.c
index 17f84b9c98b519f36248b28771a89125581807e8..1d4bd17f3676f641e62a7e8f7ddeacb781716623 100644 (file)
--- a/sbr/showfile.c
+++ b/sbr/showfile.c
@@ -15,7 +15,8 @@ showfile (char **arg, char *file)
 {
     pid_t pid;
     int isdraft, vecp;
-    char *vec[MAXARGS];
+    char **vec, *program;
+    int retval = 1;
 
     context_save();    /* save the context file */
     fflush(stdout);
@@ -28,16 +29,15 @@ showfile (char **arg, char *file)
     if (!strcmp (r1bindex (lproc, '/'), "mhl"))
        lproc = mhlproc;
 
-    switch (pid = m_vfork()) {
+    switch (pid = fork()) {
     case -1:
        /* fork error */
        advise ("fork", "unable to");
-       return 1;
+       break;
 
     case 0:
        /* child */
-       vecp = 0;
-       vec[vecp++] = r1bindex (lproc, '/');
+       vec = argsplit(lproc, &program, &vecp);
        isdraft = 1;
        if (arg) {
            while (*arg) {
@@ -53,15 +53,15 @@ showfile (char **arg, char *file)
        }
        vec[vecp] = NULL;
 
-       execvp (lproc, vec);
+       execvp (program, vec);
        fprintf (stderr, "unable to exec ");
        perror (lproc);
        _exit (-1);
 
     default:
        /* parent */
-       return (pidwait (pid, -1) & 0377 ? 1 : 0);
+       retval = pidwait (pid, -1) & 0377 ? 1 : 0;
     }
 
-    return 1;  /* NOT REACHED */
+    return retval;
 }