X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6c42153ad9362cc676ea66563bf400d7511b3b68..2b7a0f47ea3ecea7b50c3052e854eae0d306da80:/sbr/showfile.c

diff --git a/sbr/showfile.c b/sbr/showfile.c
index c099c1cd..2985dbed 100644
--- a/sbr/showfile.c
+++ b/sbr/showfile.c
@@ -1,23 +1,23 @@
-
-/*
- * showfile.c -- invoke the `lproc' command
- *
- * $Id$
+/* showfile.c -- invoke the `lproc' command
  *
  * 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 "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);
@@ -30,21 +30,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++;
 	    }
 	}
@@ -55,15 +54,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;
 }