From: Masatake YAMATO Date: Thu, 31 Aug 2023 18:34:40 +0000 (+0900) Subject: waitpid: warn of "exited" only when --verbose is given X-Git-Tag: v2.40-rc1~256^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b79dd322f5c1a37fe8b4495f7a248f406e87c598;p=thirdparty%2Futil-linux.git waitpid: warn of "exited" only when --verbose is given Signed-off-by: Masatake YAMATO --- diff --git a/misc-utils/waitpid.c b/misc-utils/waitpid.c index faf86ab6b7..0a4e03d167 100644 --- a/misc-utils/waitpid.c +++ b/misc-utils/waitpid.c @@ -64,7 +64,8 @@ static int *open_pidfds(size_t n_pids, pid_t *pids) pidfds[i] = pidfd_open(pids[i], 0); if (pidfds[i] == -1) { if (allow_exited && errno == ESRCH) { - warnx(_("PID %d has exited, skipping"), pids[i]); + if (verbose) + warnx(_("PID %d has exited, skipping"), pids[i]); continue; } err_nosys(EXIT_FAILURE, _("could not open pid %u"), pids[i]); diff --git a/tests/ts/misc/waitpid b/tests/ts/misc/waitpid index ae5ab6f928..daed74fe08 100755 --- a/tests/ts/misc/waitpid +++ b/tests/ts/misc/waitpid @@ -44,7 +44,7 @@ echo $? >> "$TS_OUTPUT" ts_finalize_subtest ts_init_subtest exited -"$TS_CMD_WAITPID" -e 2147483647 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" +"$TS_CMD_WAITPID" -v -e 2147483647 >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" echo $? >> "$TS_ERRLOG" ts_finalize_subtest