From nobody Mon Jun 9 23:53:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bGTJb5wKtz5yhfY; Mon, 09 Jun 2025 23:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bGTJb3w9Cz3KVj; Mon, 09 Jun 2025 23:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749513199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vy5LRLfJkxfWdRvFkuP/eSendQCSWOpLCVNDdRv42xg=; b=cfe0JMf3aAUaNukrs+2JQ75htYkf8EVgkhjJQL6p2pcMxZ+ld9iZhbOGCC8R2c2wWYeHlW MdPWnUpVrHvTh7tzJ+W/Dl4y6BIKJmTMr0YwI1CWL2nL9jVWS/r5foOeGTZYpZmk0EKNJi GTttkIzgIfElTHdKTXmyLd6ALw5fEzWKhUd6rnGAXlLrxPgfXZ4MZlkFPpRm71PWefoUfN QiwVS2DLefhhEevwtXZg+4rJH+bZ7+3urExNJi1WS7TxNQBvkcsAM1toHtg3/j4c7tTwju 6jWhyodLswHRx+NaPGyH8RqiX+M5KhxIShYN4kg6CWlgkonFTRMerzlVaw4DOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749513199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vy5LRLfJkxfWdRvFkuP/eSendQCSWOpLCVNDdRv42xg=; b=It5tEyaAK7aHU3Jzdx3Wu85tc/UrIzHLqBxWACdUuzlzKu4II93cU29+ukZAWDJ4US5y0R EQNtr6k7bcJBDNI15LcF10Z04m6Y71Ii/UiBCgLON1yfgQzYcEj8yP5t/dKoO6IbMpag/x jhXUN5iWlW0vO8C96qicsod9U3I5NarKPnwzd1Gl9fJga8swt5+J3HgAVXm2Qm29pULfRH DNMR3fT2FeyIYgMDqSmWig3JLK7tTR/ftoS4USBCp78wSB6VRf9vnUBf9K1UJnVc9d32+X /kW6wDKKBer+Bnd0BrxHEeavnJxZvMrx0LUvuuZNfFuX8CObb/J3L/YcaA+p/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749513199; a=rsa-sha256; cv=none; b=wunvVQz2uBolxQj+bdwFufCoi92cS1x84kg3+3nxMaJz8yQPlqUDgio/tDusil7gqBe+TZ LY7rvXIzEOaLyvdWT0breMKnm8qZLDlzl8eNE9O/v3p6rg6eFy3NDK1MoS0IJJ4gw3C5Wg jDzIKz8k5VVTI9XpDKHT7RGu3aPen9fBpcewXsYel/hV6PJstmm4Hvd73Zw1QhKZAfHvis SpdI4D3DNQJTAIUIXCtwJWimNxkxG5GIeWFGLOLTS5PP5HVYqLmfTexpnG+Cr/l+SrCWkE 58lmHiT9ukUjab/kwXzli8As96dNNGUCzs7Rk7FGuNQTTfF1tMZzNUAEtQhJDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bGTJb3Ksdz2Q0; Mon, 09 Jun 2025 23:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 559NrJgD006792; Mon, 9 Jun 2025 23:53:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 559NrJsJ006789; Mon, 9 Jun 2025 23:53:19 GMT (envelope-from git) Date: Mon, 9 Jun 2025 23:53:19 GMT Message-Id: <202506092353.559NrJsJ006789@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: bff05e8a8c3c - main - timeout(1): print errno when signalling syscalls failed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bff05e8a8c3c64bfe6152870cb758d00991ec66b Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bff05e8a8c3c64bfe6152870cb758d00991ec66b commit bff05e8a8c3c64bfe6152870cb758d00991ec66b Author: Konstantin Belousov AuthorDate: 2025-06-07 11:29:15 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-09 23:51:13 +0000 timeout(1): print errno when signalling syscalls failed Tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50752 --- 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); }