From 695ea13d191c903b86b0d5795a2686a8c6e18015 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Fri, 11 Feb 2022 12:16:52 -0500 Subject: exec: Flush I/O streams before executing anything Otherwise output from commands may appear unexpectedly earlier than output from bfs. We use fflush(NULL) to flush all streams, which is more than GNU find does, but seems to be a useful extension. --- exec.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'exec.c') diff --git a/exec.c b/exec.c index 310756b..4cfb2e0 100644 --- a/exec.c +++ b/exec.c @@ -325,6 +325,15 @@ static void bfs_exec_closewd(struct bfs_exec *execbuf, const struct BFTW *ftwbuf /** Actually spawn the process. */ static int bfs_exec_spawn(const struct bfs_exec *execbuf) { + // Before executing anything, flush all open streams. This ensures that + // - the user sees everything relevant before an -ok[dir] prompt + // - output from commands is interleaved consistently with bfs + // - executed commands can rely on I/O from other bfs actions + // + // We do not check errors here, but they will be caught at cleanup time + // with ferror(). + fflush(NULL); + if (execbuf->flags & BFS_EXEC_CONFIRM) { for (size_t i = 0; i < execbuf->argc; ++i) { fprintf(stderr, "%s ", execbuf->argv[i]); -- cgit v1.2.3