From cf696850f3a41d6c4ac449e1f7c03e30c46fc2f4 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Wed, 29 Oct 2008 12:07:34 +0000
Subject: runsvdir: kill another global

---
 runit/runsvdir.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'runit/runsvdir.c')

diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index e7f8d5ac9..d5e58e9e7 100644
--- a/runit/runsvdir.c
+++ b/runit/runsvdir.c
@@ -58,7 +58,6 @@ struct globals {
 	struct pollfd pfd[1];
 	unsigned stamplog;
 #endif
-	smallint set_pgrp;
 };
 #define G (*(struct globals*)&bb_common_bufsiz1)
 #define sv          (G.sv          )
@@ -69,7 +68,6 @@ struct globals {
 #define logpipe     (G.logpipe     )
 #define pfd         (G.pfd         )
 #define stamplog    (G.stamplog    )
-#define set_pgrp    (G.set_pgrp    )
 #define INIT_G() do { \
 } while (0)
 
@@ -109,7 +107,7 @@ static NOINLINE pid_t runsv(const char *name)
 	}
 	if (pid == 0) {
 		/* child */
-		if (set_pgrp)
+		if (option_mask32) /* -P option? */
 			setsid();
 /* man execv:
  * "Signals set to be caught by the calling process image
@@ -229,7 +227,7 @@ int runsvdir_main(int argc UNUSED_PARAM, char **argv)
 	INIT_G();
 
 	opt_complementary = "-1";
-	set_pgrp = getopt32(argv, "P");
+	getopt32(argv, "P");
 	argv += optind;
 
 	bb_signals(0
-- 
cgit v1.2.3