emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

runsvdir: kill another global

Browse Source
This commit is contained in:
Denis Vlasenko 2008-10-29 12:07:34 +00:00
parent 6a2c2cf6f3
commit cf696850f3
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runit/runsvdir.c
View File

@ -58,7 +58,6 @@ struct globals {
struct pollfd pfd[1]; struct pollfd pfd[1];
unsigned stamplog; unsigned stamplog;
#endif #endif
smallint set_pgrp;
}; };
#define G (*(struct globals*)&bb_common_bufsiz1) #define G (*(struct globals*)&bb_common_bufsiz1)
#define sv (G.sv ) #define sv (G.sv )
@ -69,7 +68,6 @@ struct globals {
#define logpipe (G.logpipe ) #define logpipe (G.logpipe )
#define pfd (G.pfd ) #define pfd (G.pfd )
#define stamplog (G.stamplog ) #define stamplog (G.stamplog )
#define set_pgrp (G.set_pgrp )
#define INIT_G() do { \ #define INIT_G() do { \
} while (0) } while (0)
@ -109,7 +107,7 @@ static NOINLINE pid_t runsv(const char *name)
} }
if (pid == 0) { if (pid == 0) {
/* child */ /* child */
if (set_pgrp) if (option_mask32) /* -P option? */
setsid(); setsid();
/* man execv: /* man execv:
* "Signals set to be caught by the calling process image * "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(); INIT_G();
opt_complementary = "-1"; opt_complementary = "-1";
set_pgrp = getopt32(argv, "P"); getopt32(argv, "P");
argv += optind; argv += optind;
bb_signals(0 bb_signals(0