aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2017-04-29 10:12:16 -0500
committerWilliam Hubbs <w.d.hubbs@gmail.com>2017-04-29 10:12:16 -0500
commit06a6a27e441372164872c7712b80728527a6ec05 (patch)
tree896d2fb259ad08d3295bfaf61477bd67679efc8d
parent5de3798afc55ce147e65926f863ec9c9cef60e79 (diff)
supervise-daemon: fix access to tty_fd and devnull_fd
Both the child and supervisor need access to these file descriptors.
-rw-r--r--src/rc/supervise-daemon.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/rc/supervise-daemon.c b/src/rc/supervise-daemon.c
index 5636eaab..b13ec9e8 100644
--- a/src/rc/supervise-daemon.c
+++ b/src/rc/supervise-daemon.c
@@ -674,6 +674,10 @@ int main(int argc, char **argv)
if (child_pid != 0)
exit(EXIT_SUCCESS);
+#ifdef TIOCNOTTY
+ tty_fd = open("/dev/tty", O_RDWR);
+#endif
+ devnull_fd = open("/dev/null", O_RDWR);
child_pid = fork();
if (child_pid == -1)
eerrorx("%s: fork: %s", applet, strerror(errno));
@@ -682,12 +686,6 @@ int main(int argc, char **argv)
/* this is the supervisor */
umask(numask);
-#ifdef TIOCNOTTY
- tty_fd = open("/dev/tty", O_RDWR);
-#endif
-
- devnull_fd = open("/dev/null", O_RDWR);
-
fp = fopen(pidfile, "w");
if (! fp)
eerrorx("%s: fopen `%s': %s", applet, pidfile, strerror(errno));