From 65cd9c7251384f7af934f8d928118b2d4829ee6c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 19 Feb 2023 01:55:28 +0900 Subject: [PATCH] exec-util: propagate error in wait_for_terminate_and_check() Then, the two error handlings becomes consistent with the one in execute_directories(). --- src/shared/exec-util.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/shared/exec-util.c b/src/shared/exec-util.c index 7ed2cce76b..51234fd025 100644 --- a/src/shared/exec-util.c +++ b/src/shared/exec-util.c @@ -151,10 +151,9 @@ static int do_execute( t = NULL; } else { r = wait_for_terminate_and_check(t, pid, WAIT_LOG); - if (FLAGS_SET(flags, EXEC_DIR_IGNORE_ERRORS)) { - if (r < 0) - continue; - } else if (r > 0) + if (r < 0) + return r; + if (!FLAGS_SET(flags, EXEC_DIR_IGNORE_ERRORS) && r > 0) return r; if (callbacks) { @@ -186,6 +185,8 @@ static int do_execute( assert(t); r = wait_for_terminate_and_check(t, pid, WAIT_LOG); + if (r < 0) + return r; if (!FLAGS_SET(flags, EXEC_DIR_IGNORE_ERRORS) && r > 0) return r; }