From f28f3774c323b1e61f24f45e8362953f0bf10cfb Mon Sep 17 00:00:00 2001 From: Vladislav Odintsov Date: Wed, 4 Sep 2024 14:18:35 +0300 Subject: [PATCH] lib: Attach stdout to child only if --log=stdout and stdout FD is a tty. 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 --- lib/libfrr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libfrr.c b/lib/libfrr.c index 0a575abac6cd..b209e4d602a4 100644 --- a/lib/libfrr.c +++ b/lib/libfrr.c @@ -1125,8 +1125,8 @@ static void frr_terminal_close(int isexit) * don't redirect when stdout is set with --log stdout */ for (fd = 2; fd >= 0; fd--) - if (isatty(fd) && - (fd != STDOUT_FILENO || !logging_to_stdout)) + if (!logging_to_stdout || !isatty(fd) || + fd != STDOUT_FILENO) dup2(nullfd, fd); close(nullfd); } @@ -1213,8 +1213,8 @@ void frr_run(struct event_loop *master) * stdout */ for (fd = 2; fd >= 0; fd--) - if (isatty(fd) && - (fd != STDOUT_FILENO || !logging_to_stdout)) + if (!logging_to_stdout || !isatty(fd) || + fd != STDOUT_FILENO) dup2(nullfd, fd); close(nullfd); }