git: 1adea6e97f81 - stable/14 - timeout(1): print errno when signalling syscalls failed
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 16 Jun 2025 08:54:13 UTC
The branch stable/14 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=1adea6e97f814194d986daeaf2ae1327183a6156
commit 1adea6e97f814194d986daeaf2ae1327183a6156
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2025-06-07 11:29:15 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2025-06-16 08:51:54 +0000
timeout(1): print errno when signalling syscalls failed
(cherry picked from commit bff05e8a8c3c64bfe6152870cb758d00991ec66b)
---
bin/timeout/timeout.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/bin/timeout/timeout.c b/bin/timeout/timeout.c
index 424e72dac9ad..05904522c5b5 100644
--- a/bin/timeout/timeout.c
+++ b/bin/timeout/timeout.c
@@ -195,7 +195,7 @@ send_sig(pid_t pid, int signo, bool foreground)
if (foreground) {
if (kill(pid, signo) == -1) {
if (errno != ESRCH)
- warnx("kill(%d, %s)", (int)pid,
+ warn("kill(%d, %s)", (int)pid,
sys_signame[signo]);
}
} else {
@@ -204,11 +204,13 @@ send_sig(pid_t pid, int signo, bool foreground)
error = procctl(P_PID, getpid(), PROC_REAP_KILL, &rk);
if (error == 0 || (error == -1 && errno == ESRCH))
;
- else if (error == -1)
- warnx("procctl(PROC_REAP_KILL)");
- else if (rk.rk_fpid > 0)
- warnx("failed to signal some processes: first pid=%d",
- (int)rk.rk_fpid);
+ else if (error == -1) {
+ warn("procctl(PROC_REAP_KILL)");
+ if (rk.rk_fpid > 0)
+ warnx(
+ "failed to signal some processes: first pid=%d",
+ (int)rk.rk_fpid);
+ }
logv("signaled %u processes", rk.rk_killed);
}