From nobody Thu Apr 24 00:29:05 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 4ZjcKY5TS1z5t8Rb; Thu, 24 Apr 2025 00:29:05 +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 4ZjcKY4nM9z41v7; Thu, 24 Apr 2025 00:29:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745454545; 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=SzL8ox7o+NHHZWAXgd6nJ4Zxrl1G9QN6XhgdNfHzB9g=; b=UYMU9koYJcd6lPTyEmeLhAs88TJP6m27WvDXkF8FV84zu2X5k2tqk6rjpal/FdyPAW1Q/L Q6Ps0Fyr6Dw2qKvT58gIxCMiqGgITUzRn+oZyjeVqRqnYUKOB3bztWXE1c9yLdHKaoAJ/x 5DbhfOlNLw+kc22RRry8kl31dR4tySFgBLxb4ewKP9etDlcHAYAE8SF02GYmpWWC7cyQr9 QCPFPg5eIUzN26ALLoeVJfDWVlpwXx1edNt03+7EcaNi5lkFkp8F7Ty9+hpUJ6RDRWAVzN 5OSefDYaJTEM6xwhViBFImDXX+J5Eln0ntIDpfFrDCxqmCjB4TUzQ8KoFe6/zA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745454545; a=rsa-sha256; cv=none; b=QogT+gTyd+SVHgpNSPJBtRkSM+LLZg9tFvUjvgnUsEPDHmQ/R2amRnxqO9nsWgP0ABEzHl 5fkSrPMOctUcyByRFhLDi9JLzvsTkojU9Ch3VCaOf5Gv2jfVBQGu2IxvEpBPeGv3xjdGou +6qCPoKFU/ECJNGU6y2vnaORwsWAQvWorMqlMm4c0+J04NmNJEpX5R02V1ytOj2rDsPm4Z xXRs8epCJrKy736s233FVnAIaOP+37vWH7fvVR9uNQqWZ4vXTTC2F9VFxJ9xu9zo/6kgRi lu4d8mqvdogyb7zICfF5s1sO5JWFxoQSm7Hp3gYCJY+4dHeM42Wjpd2MmpheIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745454545; 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=SzL8ox7o+NHHZWAXgd6nJ4Zxrl1G9QN6XhgdNfHzB9g=; b=UfhMKFQEvRErcgsZEq+4hVN4tUfgIjgOhe+Bl/aeke9jtQI375jCj1xgGhZa4/FmuuCxN3 JieTXYzc8Kzwvp7RVz6Ihw5WV07QMUUpg30YU3X86bI7K3C57BCrZBu+jv7sULhxj+wBtR 59LjWX4s3R7xCEt5iDDR4uwLgxDYb8j0UG0ykaFn5LLDvXlLQr8sWQA1DJNpGxEMJL0bvB Aga7JZ5/ZwcDgDcLlDNv42lrRyOhj3su40PCOTmekyK9J1pqURNALP+nhAcAUb7q5aMMLK gDmzPtSGXi+T7NJOPPJr/k8aNyrPpzB4k+tPkLN0mB0wYNHzuHJjtREPnXVnxA== 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 4ZjcKY48xZzB6s; Thu, 24 Apr 2025 00:29:05 +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 53O0T5Xq084538; Thu, 24 Apr 2025 00:29:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53O0T5CT084535; Thu, 24 Apr 2025 00:29:05 GMT (envelope-from git) Date: Thu, 24 Apr 2025 00:29:05 GMT Message-Id: <202504240029.53O0T5CT084535@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: 0ad5308987d0 - stable/14 - Add POSIX psiginfo(3) call 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: 0ad5308987d0a34d49e1c963537759f1b73b3a4e Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0ad5308987d0a34d49e1c963537759f1b73b3a4e commit 0ad5308987d0a34d49e1c963537759f1b73b3a4e Author: Ricardo Branco AuthorDate: 2025-04-16 07:52:13 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-24 00:27:57 +0000 Add POSIX psiginfo(3) call PR: 286133 (cherry picked from commit 3b2f0bfc35167724a41c969c1823be6b1ede15ab) --- include/signal.h | 1 + lib/libc/gen/Makefile.inc | 3 ++- lib/libc/gen/Symbol.map | 1 + lib/libc/gen/psignal.3 | 22 +++++++++++++++++++++- lib/libc/gen/psignal.c | 6 ++++++ 5 files changed, 31 insertions(+), 2 deletions(-) diff --git a/include/signal.h b/include/signal.h index ee73b8ed492c..844630a8aafc 100644 --- a/include/signal.h +++ b/include/signal.h @@ -117,6 +117,7 @@ int siginterrupt(int, int); #endif #if __POSIX_VISIBLE >= 200809 +void psiginfo(const siginfo_t *, const char *); void psignal(int, const char *); #endif diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index f9f6f3139379..3e5f6ae8d602 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -487,7 +487,8 @@ MLINKS+=posix_spawn.3 posix_spawnp.3 \ posix_spawnattr_getsigdefault.3 posix_spawnattr_setsigdefault.3 \ posix_spawnattr_getsigmask.3 posix_spawnattr_setsigmask.3 \ posix_spawnattr_init.3 posix_spawnattr_destroy.3 -MLINKS+=psignal.3 strsignal.3 \ +MLINKS+=psignal.3 psiginfo.3 \ + psignal.3 strsignal.3 \ psignal.3 sys_siglist.3 \ psignal.3 sys_signame.3 MLINKS+=pwcache.3 group_from_gid.3 \ diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index 5178ce56da33..2542da299cb1 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -461,6 +461,7 @@ FBSD_1.8 { aio_read2; aio_write2; execvpe; + psiginfo; rtld_get_var; rtld_set_var; }; diff --git a/lib/libc/gen/psignal.3 b/lib/libc/gen/psignal.3 index 0fc63418d3f3..b02d23dc16f1 100644 --- a/lib/libc/gen/psignal.3 +++ b/lib/libc/gen/psignal.3 @@ -27,11 +27,12 @@ .\" .\" @(#)psignal.3 8.2 (Berkeley) 2/27/95 .\" -.Dd May 30, 2016 +.Dd Apr 16, 2025 .Dt PSIGNAL 3 .Os .Sh NAME .Nm psignal , +.Nm psiginfo , .Nm strsignal , .Nm sys_siglist , .Nm sys_signame @@ -42,6 +43,8 @@ .In signal.h .Ft void .Fn psignal "int sig" "const char *s" +.Ft void +.Fn psiginfo "const siginfo_t *si" "const char *s" .Vt extern const char * const sys_siglist[] ; .Vt extern const char * const sys_signame[] ; .In string.h @@ -81,6 +84,16 @@ the string .Dq "Unknown signal" is produced. .Pp +The +.Fn psiginfo +function is similar to +.Fn psignal , +except that the signal number information is taken from the +.Fa si +argument which is a +.Vt siginfo_t +structure. +.Pp The message strings can be accessed directly through the external array .Va sys_siglist , @@ -106,3 +119,10 @@ The .Fn psignal function appeared in .Bx 4.2 . +The +.Fn psiginfo +function appeared in +.Fx 15.0 , +.Nx 6.0 , +and +.Dx 4.1 . diff --git a/lib/libc/gen/psignal.c b/lib/libc/gen/psignal.c index f8caf7621e83..eb05b08d2c27 100644 --- a/lib/libc/gen/psignal.c +++ b/lib/libc/gen/psignal.c @@ -57,3 +57,9 @@ psignal(int sig, const char *s) (void)_write(STDERR_FILENO, c, strlen(c)); (void)_write(STDERR_FILENO, "\n", 1); } + +void +psiginfo(const siginfo_t *si, const char *s) +{ + psignal(si->si_signo, s); +}