From nobody Thu Apr 17 15:20:00 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 4ZdhQn2LW9z5tJDk; Thu, 17 Apr 2025 15:20:01 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZdhQn1LHBz3w26; Thu, 17 Apr 2025 15:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744903201; 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=yQYTDKDIRG5BdtAalkz75shN0M/mMR5zEtGu1p4OKos=; b=CgIplnHItjYUqE21veHZUsXOoK/DziLZNtt/Rz8XCpyI8zM8Mh38ne+BhVKZ7mZFXEaDt9 oWcof+a94NHzi67eBHnaslC54K+x2AQIKZLv/pZg2IxMS1JmqvkkaWu7Spm3VKBSTDW0CP yOr4y04J89xaPzMe1ZCy4+3eaPr0edO+KWwc+ZVo+LN3HlHuUyfJaoF+9sLpH+20xy6xbf PJWDEVXGfKNAo55nN2XrDctf0D1cc6d1X0F6NplOB2CoPkpOhDfizkFKHjt0OXIHziNKCj ShQ6QOos8GIsigG7hoCBC90wx7wh91q01u04+1hGBcGbME5zgxrUG8qMnEcQ2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744903201; a=rsa-sha256; cv=none; b=mlbesNOKleQB4k+qEtigCnZc2AYXu4FRhfw68P3Nhy8QER4oFtQ+MTqnUaPNZqmMptC1k7 wYNgezRx2eA7lXxPZZNsa4wGSNT8kiv6zSenyNS+li8oQFqVeCUocuYiAgK6mv6iIcLDSw 7Xoaf89SOfaCivT8WcgSs91zp7KTLjsCucWVKhuA+7U+E8W3Pj/ebs9VCnwpZfVtJRTJqN m6Bty0kvlnnnDUv6KD05WcZo1KT/4G2BQl4J+Ud6zG6Xh5wuvn+OGQHSCraXcUu0jBuS0q rVYwZc1xdbfy3ANgpA3x0wFCnQwaASkyGHLqN6Y41ufy6q5ts6V3vqksDSX2Qg== 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=1744903201; 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=yQYTDKDIRG5BdtAalkz75shN0M/mMR5zEtGu1p4OKos=; b=upqfjjhGb28m6FuQOxiXbUARJY4WPlEzWnG+EPcAGKyspXHLmuPkOox24u0b30jqWPOYYW 6JmNiV9hfRXSuy+eFxMxd1tLayaRdcHUE4rovogjfXQKEzThbQ6vYV5JI7fCNtuXC/dr1h AgsUZKtuu3olsv0MbrifVZv6czjkDhsBqVgahwJi4Sx5gogGjZ8qlOARV+6fN/rmW8S+qr TKZy3pbtqpllAeyyQTnvVqdHHuwDE/D0JwmTZQnfyvf3vWgsqL7zLncVVpFGDoISaqFqeU fUqO4Wou2tWAafzTbJuxEJg9xQ5MDk/BXnitSCe4y38J4R4bjIlijTD7x/jUdQ== 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 4ZdhQn0Xl3ztGH; Thu, 17 Apr 2025 15:20:01 +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 53HFK0j4057408; Thu, 17 Apr 2025 15:20:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53HFK0o7057403; Thu, 17 Apr 2025 15:20:00 GMT (envelope-from git) Date: Thu, 17 Apr 2025 15:20:00 GMT Message-Id: <202504171520.53HFK0o7057403@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: 3b2f0bfc3516 - main - Add POSIX psiginfo(3) call 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: 3b2f0bfc35167724a41c969c1823be6b1ede15ab Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3b2f0bfc35167724a41c969c1823be6b1ede15ab commit 3b2f0bfc35167724a41c969c1823be6b1ede15ab Author: Ricardo Branco AuthorDate: 2025-04-16 07:52:13 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-17 15:19:44 +0000 Add POSIX psiginfo(3) call Signed-off-by: Ricardo Branco PR: 286133 MFC after: 1 week Github PR: https://github.com/freebsd/freebsd-src/pull/1666 --- 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 388e164d7943..c1d341f317f4 100644 --- a/include/signal.h +++ b/include/signal.h @@ -115,6 +115,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 9b92e52cdfad..a8308a057b05 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -465,7 +465,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 gid_from_group.3 \ diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index ca3974e6b747..21b66acba213 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -458,6 +458,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 cd3cef0b44a9..605c3cf2d8fe 100644 --- a/lib/libc/gen/psignal.3 +++ b/lib/libc/gen/psignal.3 @@ -25,11 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.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 @@ -40,6 +41,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 @@ -79,6 +82,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 , @@ -104,3 +117,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 ab044f683d86..291a6a9337a0 100644 --- a/lib/libc/gen/psignal.c +++ b/lib/libc/gen/psignal.c @@ -55,3 +55,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); +}