From nobody Sun Jul 06 23:18:46 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 4bb3GG6km7z60Zfx; Sun, 06 Jul 2025 23:18:46 +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 4bb3GG3cS2z3tjJ; Sun, 06 Jul 2025 23:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751843926; 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=Cocyl7xw+KDt2Nep6L0J7OLcz1vD7aFctYWn2Lwdmxc=; b=HSlHRte0dj0Fc2kpug1FlcY+Z9NKREhvRkVOxIAV87kuEIqpkUkAWN9GnDqP3aQai0ZVlB XsM56QqWxoTo6tDSuFB0f1guZdPl8YS03Cb/N146k6eKGyabSPYB1cSOuFQntmqH7HrDrF N4znvSNN1d2LM6Plxexu3C/KLtE1rjSsLJJRn7UVvHK82HBZWVlIiiolQ9UqfKSlOJpPeA YputyF86cIvDuwwJ7UXQByqr0cXPxJqtEPMlQYoY7FnmChWaWyC3Eu9IW1O6QW6Q8WMCJw 4JI4vFRL4pa/ScgFdpbVDBQMaf8I968kqkn/uO/d9dU9PxGFdtTRCdJygEEDWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751843926; 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=Cocyl7xw+KDt2Nep6L0J7OLcz1vD7aFctYWn2Lwdmxc=; b=sDxnjTeskMNnkTH5N38f9h6WF09s8Tx+t3iFU4dcQzlCsSc12nNqb+9osIpugOqQj+lWBB I6K1oz3uvgF9cbBYfzupNc/JEdmt+LJ69+CwyiBkz7jw+PVOQq2XbCr6TuOq5DAJCobTiY tdMbeu4Sk3PZHW+2qW5Aao9E4AxEPfBjisJDTsVy5jEsOoFURiM34nYZHK9wkkoqKsHGY6 NR1rP7xizHUI9ulkZT0V5PVPKwRe3qea7QId2VoOSvJ29CX4D+GARpu2VM5oWPpP2JkDes loNfXR6NCag6Tte0kSm6m95OxCzGL64ZzTIrgb1PqxxzkpPPhe1NNEb1iAvEfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751843926; a=rsa-sha256; cv=none; b=FLn5ZLoGHiTFACfZfUW4+CaGmfqYiz3ibOoSygAp1B75Z/nWL6TtUyyLGyUW6ZFiGH7gxr y6hKLX6RauDRtC7KBk68S4LSs7ROjx7CJI3Pu1IQjvGe4A9CzCg3vmfJ8y5pYQoYjloHbf TyOmyUxFkIWsyWGm4NFusWvL1uP+OGjmOgZnBii0ofQMTIbafbXPq6X0IV+j891Ihr9Bjc BL42DdaBUU0cn4ovLfGi+5Qsb3Pdqvykk9tYrdmjG6/lhKF901/Pa4su47HXOqJnh/qITW YkdIjBgCrl6nB/vOXNPGl+U3kVum4Kn2XAnIetw29QKmUlxCV4lpsXJwKjWb3A== 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 4bb3GG2wdGz9PK; Sun, 06 Jul 2025 23:18:46 +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 566NIkjP031416; Sun, 6 Jul 2025 23:18:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 566NIk37031413; Sun, 6 Jul 2025 23:18:46 GMT (envelope-from git) Date: Sun, 6 Jul 2025 23:18:46 GMT Message-Id: <202507062318.566NIk37031413@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ea4042246d61 - main - libsysdecode: Add O_CLOFORK flags to sysdecode 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea4042246d618ed67275ed8fc0685c1dd6bcb8e5 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ea4042246d618ed67275ed8fc0685c1dd6bcb8e5 commit ea4042246d618ed67275ed8fc0685c1dd6bcb8e5 Author: Ricardo Branco AuthorDate: 2025-05-17 18:27:37 +0000 Commit: Mark Johnston CommitDate: 2025-07-06 23:09:18 +0000 libsysdecode: Add O_CLOFORK flags to sysdecode Reviewed by: kib MFC after: 1 month Pull Request: https://github.com/freebsd/freebsd-src/pull/1698 --- lib/libsysdecode/flags.c | 13 +++++++------ lib/libsysdecode/sysdecode_fcntl_arg.3 | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/libsysdecode/flags.c b/lib/libsysdecode/flags.c index dc09c5747968..f8e26e6a9dae 100644 --- a/lib/libsysdecode/flags.c +++ b/lib/libsysdecode/flags.c @@ -196,7 +196,7 @@ sysdecode_vmprot(FILE *fp, int type, int *rem) } static struct name_table sockflags[] = { - X(SOCK_CLOEXEC) X(SOCK_NONBLOCK) XEND + X(SOCK_CLOEXEC) X(SOCK_CLOFORK) X(SOCK_NONBLOCK) XEND }; bool @@ -206,16 +206,17 @@ sysdecode_socket_type(FILE *fp, int type, int *rem) uintmax_t val; bool printed; - str = lookup_value(socktype, type & ~(SOCK_CLOEXEC | SOCK_NONBLOCK)); + str = lookup_value(socktype, + type & ~(SOCK_CLOEXEC | SOCK_CLOFORK | SOCK_NONBLOCK)); if (str != NULL) { fputs(str, fp); *rem = 0; printed = true; } else { - *rem = type & ~(SOCK_CLOEXEC | SOCK_NONBLOCK); + *rem = type & ~(SOCK_CLOEXEC | SOCK_CLOFORK | SOCK_NONBLOCK); printed = false; } - val = type & (SOCK_CLOEXEC | SOCK_NONBLOCK); + val = type & (SOCK_CLOEXEC | SOCK_CLOFORK | SOCK_NONBLOCK); print_mask_part(fp, sockflags, &val, &printed); return (printed); } @@ -563,7 +564,7 @@ sysdecode_nfssvc_flags(int flags) } static struct name_table pipe2flags[] = { - X(O_CLOEXEC) X(O_NONBLOCK) XEND + X(O_CLOEXEC) X(O_CLOFORK) X(O_NONBLOCK) XEND }; bool @@ -873,7 +874,7 @@ sysdecode_fcntl_cmd(int cmd) } static struct name_table fcntl_fd_arg[] = { - X(FD_CLOEXEC) X(0) XEND + X(FD_CLOEXEC) X(FD_CLOFORK) X(0) XEND }; bool diff --git a/lib/libsysdecode/sysdecode_fcntl_arg.3 b/lib/libsysdecode/sysdecode_fcntl_arg.3 index ee3a030a79e4..d5648ce0adc3 100644 --- a/lib/libsysdecode/sysdecode_fcntl_arg.3 +++ b/lib/libsysdecode/sysdecode_fcntl_arg.3 @@ -54,7 +54,8 @@ are determined by .It Sy Command Ta Fa arg Sy Type Ta Sy Output Format .It .It Dv F_SETFD Ta Vt int Ta -.Dq FD_CLOEXEC +.Dq FD_CLOEXEC , +.Dq FD_CLOFORK or the value of .Fa arg in the indicated