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 <[email protected]>
FRRouting · Sep 10, 2024 · de8a402 · de8a402
1 parent 7ba895f
commit de8a402
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/lib/libfrr.c b/lib/libfrr.c
@@ -1125,9 +1125,11 @@ 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) {
+				/* Do nothing. */
+			} else {
 				dup2(nullfd, fd);
+			}
 		close(nullfd);
 	}
 }
@@ -1213,9 +1215,11 @@ 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) {
+					/* Do nothing. */
+				} else {
 					dup2(nullfd, fd);
+				}
 			close(nullfd);
 		}