X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fshowfile.c;h=594b269f2cbc8375f2acd220d0be871d43c18850;hp=b8e984b528162b64b31e286ac64c539a1aad4331;hb=0073224c28bf81dad1812d406bb9915b24b23eb6;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1

diff --git a/sbr/showfile.c b/sbr/showfile.c
index b8e984b..594b269 100644
--- a/sbr/showfile.c
+++ b/sbr/showfile.c
@@ -1,16 +1,16 @@
 /*
- * 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.
- */
+** 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>
 
 
 int
-showfile (char **arg, char *file)
+showfile(char **arg, char *file)
 {
 	pid_t pid;
 	int isdraft, vecp;
@@ -20,23 +20,23 @@ showfile (char **arg, char *file)
 	fflush(stdout);
 
 	/*
-	 * If you have your lproc listed as "mhl",
-	 * then really invoked the mhlproc instead
-	 * (which is usually mhl anyway).
-	 */
-	if (!strcmp (r1bindex (lproc, '/'), "mhl"))
+	** If you have your lproc listed as "mhl",
+	** then really invoked the mhlproc instead
+	** (which is usually mhl anyway).
+	*/
+	if (strcmp(mhbasename(lproc), "mhl")==0)
 		lproc = mhlproc;
 
-	switch (pid = vfork()) {
+	switch (pid = fork()) {
 	case -1:
 		/* fork error */
-		advise ("fork", "unable to");
+		advise("fork", "unable to");
 		return 1;
 
 	case 0:
 		/* child */
 		vecp = 0;
-		vec[vecp++] = r1bindex (lproc, '/');
+		vec[vecp++] = mhbasename(lproc);
 		isdraft = 1;
 		if (arg) {
 			while (*arg) {
@@ -46,20 +46,20 @@ showfile (char **arg, char *file)
 			}
 		}
 		if (isdraft) {
-			if (!strcmp (vec[0], "show"))
+			if (strcmp(vec[0], "show")==0)
 				vec[vecp++] = "-file";
 			vec[vecp++] = file;
 		}
 		vec[vecp] = NULL;
 
-		execvp (lproc, vec);
-		fprintf (stderr, "unable to exec ");
-		perror (lproc);
-		_exit (-1);
+		execvp(lproc, vec);
+		fprintf(stderr, "unable to exec ");
+		perror(lproc);
+		_exit(-1);
 
 	default:
 		/* parent */
-		return (pidwait (pid, -1) & 0377 ? 1 : 0);
+		return (pidwait(pid, -1) & 0377 ? 1 : 0);
 	}
 
 	return 1;  /* NOT REACHED */