summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2008-10-29 12:07:34 +0000
committerDenis Vlasenko2008-10-29 12:07:34 +0000
commitcf696850f3a41d6c4ac449e1f7c03e30c46fc2f4 (patch)
treeb19616a3a85485652b7f8a1beaa0a077052fb2f3
parent6a2c2cf6f3b4f03e18a0118f62f1ebc762ad35a3 (diff)
downloadbusybox-cf696850f3a41d6c4ac449e1f7c03e30c46fc2f4.zip
busybox-cf696850f3a41d6c4ac449e1f7c03e30c46fc2f4.tar.gz
runsvdir: kill another global
-rw-r--r--runit/runsvdir.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index e7f8d5a..d5e58e9 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