From b18613b09f3078ea90c4ef56645df0714a4fff22 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 22 Oct 2024 11:13:07 -0400 Subject: [PATCH] Revert "lib: Attach stdout to child only if --log=stdout and stdout FD is a tty" This reverts commit 0e3c5e8e5907321b35201f0985c1d3f4a1b0e639. (cherry picked from commit 6a36b9ef49bfce59a7e674df233265da6d275257) --- lib/libfrr.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/lib/libfrr.c b/lib/libfrr.c index d3e20a6753..cb295f7e1b 100644 --- a/lib/libfrr.c +++ b/lib/libfrr.c @@ -1110,12 +1110,9 @@ static void frr_terminal_close(int isexit) * don't redirect when stdout is set with --log stdout */ for (fd = 2; fd >= 0; fd--) - if (logging_to_stdout && isatty(fd) && - fd == STDOUT_FILENO) { - /* Do nothing. */ - } else { + if (isatty(fd) && + (fd != STDOUT_FILENO || !logging_to_stdout)) dup2(nullfd, fd); - } close(nullfd); } } @@ -1201,12 +1198,9 @@ void frr_run(struct event_loop *master) * stdout */ for (fd = 2; fd >= 0; fd--) - if (logging_to_stdout && isatty(fd) && - fd == STDOUT_FILENO) { - /* Do nothing. */ - } else { + if (isatty(fd) && + (fd != STDOUT_FILENO || !logging_to_stdout)) dup2(nullfd, fd); - } close(nullfd); } -- 2.39.5