proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-29 18:15:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: Attach stdout to child only if --log=stdout and stdout FD is a tty

Browse Source 
Prior to this commit stdout of a process started in a daemon mode was
attached to a calling process.
As a result a calling process hung for infinity.

Signed-off-by: Vladislav Odintsov <vlodintsov@k2.cloud>
(cherry picked from commit 0e3c5e8e59)
This commit is contained in:
Vladislav Odintsov 2024-09-04 14:18:35 +03:00 committed by Mergify
parent cd82888fe8
commit b496e4b1df
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/libfrr.c
View File

@ -1108,9 +1108,12 @@ 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 (isatty(fd) && if (logging_to_stdout && isatty(fd) &&
(fd != STDOUT_FILENO || !logging_to_stdout)) fd == STDOUT_FILENO) {
/* Do nothing. */
} else {
dup2(nullfd, fd); dup2(nullfd, fd);
}
close(nullfd); close(nullfd);
} }
} }
@ -1196,9 +1199,12 @@ void frr_run(struct event_loop *master)
* stdout * stdout
*/ */
for (fd = 2; fd >= 0; fd--) for (fd = 2; fd >= 0; fd--)
if (isatty(fd) && if (logging_to_stdout && isatty(fd) &&
(fd != STDOUT_FILENO || !logging_to_stdout)) fd == STDOUT_FILENO) {
/* Do nothing. */
} else {
dup2(nullfd, fd); dup2(nullfd, fd);
}
close(nullfd); close(nullfd);
} }