From nobody Mon Jun 16 08:54:11 2025 X-Original-To: dev-commits-src-all@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 4bLP1w6FQ4z5Vq8c; Mon, 16 Jun 2025 08:54:12 +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 4bLP1w2pR9z3wrL; Mon, 16 Jun 2025 08:54:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750064052; 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=qq6UYtmZdGCtQ4fuheit/ABBBvDuSVoPau29dXUWnxE=; b=PRRtLiPdiRn7rYA39PFbPCxnIRk2lzqGzdc7Apde30X9jenxWtYOeG0Gtte4eIr8acFK+e zLx8MGVIl0y2ZJtIzwrynVJysmoN9ESCZcjVAF8+BIs3AF7hxcj3ld69Fx+ofHsHNjMnMc qFB5FpZv6j/bjJKGW0zwu0l/VWgQBl6kDR6nf/hTbbZrPIMsGIM/Qab/1pyHcY5tSNfLiq z1m85kkr8HwlelE6ntsmbiPNuzux50/D82eXeFItqBwe5ayP0PA9NivKJd6g9B9CUlbvIm pBo2zg7DCU4SpH0X6psrTQitzpj4T4wLrD7jMa1ELyC8hFc3A+7AAC4dtZTHWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750064052; 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=qq6UYtmZdGCtQ4fuheit/ABBBvDuSVoPau29dXUWnxE=; b=EVA2bL4MpIlpX8kSfaKSJNq/UdBzts/l2G8JdKnWhKyyeEtIT/c6RkNkiFWOY3P7pnjVqn YXFxZ+I7tMkR2FGZryir9OxvN8cKT1s+Evww3pMuKLr2F54PjFSYChbNO+0ZwhZLH9qjuR RGFtwyYTCm3vsQ3N7RXymg0IUmfFm3+MzTJM4aYYO0RB6VEcwcArKqrS+CeGgG6G+JB30Q dY3sRDx0Yh3t4RbW4R4E/NSKogKcU2RWYcrd9c4t9/FjgDP2Zbi1NxODw/Y8IAUFlGp1nD mAjjelblAFpC4s0rttWJzFaAVr6uoGsoxrUqUeVPdjT74rl7ZeOhGTODU5rvlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750064052; a=rsa-sha256; cv=none; b=vEKh0ej0eiRRtA5eVi7eB7McK4OkRrfuUZFT904J1fHqu8UPngPSIENi8rrEi73h50IMT4 8RBTimluV9pvJnSuerO1m67ZePsO/MlIzCZFc3YP6oEYOpSd4nvbbc1SwjmYpNFmQH2dC6 shQWEOTGVIDWzyeasJWo8OidMLtpp9OnoEHR5i7hxnl9H7t8YFcq/JBk4jUA8flygdqsPs zOCRh1uipeTdNkfPV7hypBoBDLyEAwLSGO8lxhptzOmm2tPc/U9HhKXDU60HJS39Ma8h2x td3rFV7vTGIEVCjmM125RQCRNtnkfsZva/vGhEvkuui6pKoy/pkoSMO5SDaPZQ== 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 4bLP1w09Wlzrqn; Mon, 16 Jun 2025 08:54:12 +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 55G8sBGO043556; Mon, 16 Jun 2025 08:54:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G8sBgb043553; Mon, 16 Jun 2025 08:54:11 GMT (envelope-from git) Date: Mon, 16 Jun 2025 08:54:11 GMT Message-Id: <202506160854.55G8sBgb043553@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c55fd0184a17 - stable/14 - timeout(1): silence warnings for ESRCH List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: c55fd0184a17d2cb56884e6e2a15e70ad503ff76 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c55fd0184a17d2cb56884e6e2a15e70ad503ff76 commit c55fd0184a17d2cb56884e6e2a15e70ad503ff76 Author: Konstantin Belousov AuthorDate: 2025-06-07 11:24:32 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-16 08:51:54 +0000 timeout(1): silence warnings for ESRCH (cherry picked from commit 15e4b8d5ef845066819c4cbb5d03b63148688298) --- bin/timeout/timeout.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/bin/timeout/timeout.c b/bin/timeout/timeout.c index e9c4e22fc7d3..424e72dac9ad 100644 --- a/bin/timeout/timeout.c +++ b/bin/timeout/timeout.c @@ -188,16 +188,23 @@ static void send_sig(pid_t pid, int signo, bool foreground) { struct procctl_reaper_kill rk; + int error; logv("sending signal %s(%d) to command '%s'", sys_signame[signo], signo, command); if (foreground) { - if (kill(pid, signo) == -1) - warnx("kill(%d, %s)", (int)pid, sys_signame[signo]); + if (kill(pid, signo) == -1) { + if (errno != ESRCH) + warnx("kill(%d, %s)", (int)pid, + sys_signame[signo]); + } } else { memset(&rk, 0, sizeof(rk)); rk.rk_sig = signo; - if (procctl(P_PID, getpid(), PROC_REAP_KILL, &rk) == -1) + 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",