read_switch.c: Move interface declaration to own file.

[nmh] / sbr / showfile.c

diff --git a/sbr/showfile.c b/sbr/showfile.c
index 7ed13cacbda62a26039c9c45cc17aa37b24ff260..7daadaeda6d84bc1ccd343f49e23a98f4ed75b7e 100644 (file)
--- a/sbr/showfile.c
+++ b/sbr/showfile.c
@@ -1,19 +1,25 @@
-
-/*
- * showfile.c -- invoke the `lproc' command
+/* showfile.c -- invoke the `lproc' command
  *
- * $Id$
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "showfile.h"
+#include "r1bindex.h"
+#include "context_save.h"
+#include "arglist.h"
+#include "error.h"
 
 
 int
 showfile (char **arg, char *file)
 {
     pid_t pid;
-    int isdraft, vecp;
-    char *vec[MAXARGS];
+    int vecp;
+    char **vec, *program;
+    int retval = 1;
 
     context_save();    /* save the context file */
     fflush(stdout);
@@ -26,21 +32,20 @@ showfile (char **arg, char *file)
     if (!strcmp (r1bindex (lproc, '/'), "mhl"))
        lproc = mhlproc;
 
-    switch (pid = vfork()) {
+    switch (pid = fork()) {
     case -1:
        /* fork error */
        advise ("fork", "unable to");
-       return 1;
+       break;
 
     case 0:
        /* child */
-       vecp = 0;
-       vec[vecp++] = r1bindex (lproc, '/');
-       isdraft = 1;
+       vec = argsplit(lproc, &program, &vecp);
+       bool isdraft = true;
        if (arg) {
            while (*arg) {
                if (**arg != '-')
-                   isdraft = 0;
+                   isdraft = false;
                vec[vecp++] = *arg++;
            }
        }
@@ -51,15 +56,15 @@ showfile (char **arg, char *file)
        }
        vec[vecp] = NULL;
 
-       execvp (lproc, vec);
+       execvp (program, vec);
        fprintf (stderr, "unable to exec ");
        perror (lproc);
-       _exit (-1);
+       _exit(1);
 
     default:
        /* parent */
-       return (pidwait (pid, -1) & 0377 ? 1 : 0);
+       retval = pidwait (pid, -1) & 0377 ? 1 : 0;
     }
 
-    return 1;  /* NOT REACHED */
+    return retval;
 }