matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #17198 from donaldsharp/backout_stdout_changes

Browse source 
Revert "lib: Attach stdout to child only if --log=stdout and stdout F…
This commit is contained in:
Russ White 2024-10-22 16:35:05 -04:00 committed by GitHub
parent 8ccd538847 6a36b9ef49
commit a4ecc2f4d2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/libfrr.c
View file

@ -1126,12 +1126,9 @@ static void frr_terminal_close(int isexit)
* don't redirect when stdout is set with --log stdout * don't redirect when stdout is set with --log stdout
*/ */
for (fd = 2; fd >= 0; fd--) for (fd = 2; fd >= 0; fd--)
if (logging_to_stdout && isatty(fd) && if (isatty(fd) &&
fd == STDOUT_FILENO) { (fd != STDOUT_FILENO || !logging_to_stdout))
/* Do nothing. */
} else {
dup2(nullfd, fd); dup2(nullfd, fd);
}
close(nullfd); close(nullfd);
} }
} }
@ -1217,12 +1214,9 @@ void frr_run(struct event_loop *master)
* stdout * stdout
*/ */
for (fd = 2; fd >= 0; fd--) for (fd = 2; fd >= 0; fd--)
if (logging_to_stdout && isatty(fd) && if (isatty(fd) &&
fd == STDOUT_FILENO) { (fd != STDOUT_FILENO || !logging_to_stdout))
/* Do nothing. */
} else {
dup2(nullfd, fd); dup2(nullfd, fd);
}
close(nullfd); close(nullfd);
} }