aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-02-03 05:04:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

subd: handle stdin being closed (eg. --daemon).

Browse Source 
We need to do a more complex dance if stdin was important.

Fixes: #1016
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-02-20 15:46:54 +10:30
committed by Christian Decker
parent 6bacab5e87
commit eca55cee3c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lightningd/subd.c
View File

@@ -157,7 +157,7 @@ static int subd(const char *dir, const char *name,
goto close_execfail_fail;
if (childpid == 0) {
int fdnum = 3, i;
int fdnum = 3, i, stdin_is_now = STDIN_FILENO;
long max;
size_t num_args;
char *args[] = { NULL, NULL, NULL, NULL, NULL };
@@ -167,6 +167,8 @@ static int subd(const char *dir, const char *name,
// msg = STDIN
if (childmsg[1] != STDIN_FILENO) {
/* Do we need to move STDIN out the way? */
stdin_is_now = dup(STDIN_FILENO);
if (!move_fd(childmsg[1], STDIN_FILENO))
goto child_errno_fail;
}
@@ -181,9 +183,11 @@ static int subd(const char *dir, const char *name,
/* Dup any extra fds up first. */
if (ap) {
while ((fd = va_arg(*ap, int *)) != NULL) {
/* If this were stdin, dup2 closed! */
assert(*fd != STDIN_FILENO);
if (!move_fd(*fd, fdnum))
int actual_fd = *fd;
/* If this were stdin, we moved it above! */
if (actual_fd == STDIN_FILENO)
actual_fd = stdin_is_now;
if (!move_fd(actual_fd, fdnum))
goto child_errno_fail;
fdnum++;
}