From nobody Wed Aug 5 15:16:23 2026 X-Original-To: dev-commits-src-branches@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 4hFYsM5Fp1z6nQhT for ; Wed, 05 Aug 2026 15:16:23 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hFYsM3vfbz3vgP for ; Wed, 05 Aug 2026 15:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785942983; 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=rd56WPkPvwVVEVRBmW4mn+mTshV6JOyy3MngQcbZkyQ=; b=EnMo6c2UxEKq6qKL6bgy1NhITdJNjGh4ceIqBzTS+neM9DZmoYnl7BXcm3JnHzBWa85rTj ZfaF5KgFJulBocPxXErtFe0YYhi8d2poJDlVbgkvCvLxwFni/FO/D9fJYtdS4mfUv+GpA3 VHFNCg+fXzJnvUhY5aZ+aNHssyEIeJRf7oJMJ9rPnXwKpl3JoCbrm8Ayto9ZopLDE9oGJv 8XcILRFvNMMWCJmjy9MR+e8H4Ak1SApjbLhS3OjDyXBaZOr4m3xwNnTpLVx93nVjH1wZFX uMstf+gyQCQpGwUcpZ4hwGkV11rUes/ar3D16BWweK6oHGHYOAYv4nQQfJknOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785942983; a=rsa-sha256; cv=none; b=wIthGZzs0Up9rNdOGv3VavwHDwwl6m5vKZW4dqQQwnEh6R0HdUQ5c4Sz1k0+qriqXqektS P2SGXj27Axwmn+1PvuMZfUV/QhTx4edI7mpGoT+TsZRs0hPP+wnmGCu144/caoWz9aNW+9 JlEA5ZMlDJinujwJEfmSJbXUHm4Pc+1jps3Nm16HVmjgpM+fqWMxNW3xoSo9HphUZUQbn5 jh/4pA7AlEgaoe5El/RstQ+dD3lVkD/X2l1Z13S1r4d3IlyscuBazSNE73Rth6I8fEgwMq +G6Am+v8Qg+4gRkSJvlTG6839oh7nsX0kXqjixa4psZ1IHIBEzuYuvnGPAKRHw== 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=1785942983; 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=rd56WPkPvwVVEVRBmW4mn+mTshV6JOyy3MngQcbZkyQ=; b=PdNoehK32V0ef21I6FGgviHZtAk2omz0ZSsUiODZZEuDcTRHgxsDB9iC/Y05mw2h5lsuD9 4T/u2x9IUV7UEaYp2QjVbXcPdNvhjPZHxuourJ9e9y+Czhd902HSxvkDkrQAZ+wcest8R0 AffcZkN24wGOfYzxPOwsCwyXj5vggWzlcT3sspUqSaSr0GfDK4NG8wyyKgrizsL4FFp2xN MUFuHng3zWP3nJhBFTvgAlUi4jWgGXV8PjLNrpcmsQiCmLdH+cqWfw6mMydIzrPs59SAfe VsonhpbxTOY0CD2qtyoG5K/ypGHu2MCdIrMIewV2COJyocXvuCkblWFKj/Hfng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hFYsM2Jqyzfg3 for ; Wed, 05 Aug 2026 15:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44fdb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 05 Aug 2026 15:16:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e61884183ed4 - stable/14 - libc: Add inotify support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/14 X-Git-Reftype: branch X-Git-Commit: e61884183ed4bbe84dfcc242fecd2bffb943af96 Auto-Submitted: auto-generated Date: Wed, 05 Aug 2026 15:16:23 +0000 Message-Id: <6a7353c7.44fdb.976d7c9@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e61884183ed4bbe84dfcc242fecd2bffb943af96 commit e61884183ed4bbe84dfcc242fecd2bffb943af96 Author: Mark Johnston AuthorDate: 2025-07-03 20:08:59 +0000 Commit: Mark Johnston CommitDate: 2026-08-05 15:15:14 +0000 libc: Add inotify support inotify_init() and inotify_init1() are implemented using __specialfd(2). inotify_add_watch() is implemented in terms of inotify_add_watch_at(2). Reviewed by: kib MFC after: 3 months Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50315 (cherry picked from commit 245ff4c4b2c2728674121a5d9736a5e079bd00b2) --- lib/libc/gen/Makefile.inc | 1 + lib/libc/gen/Symbol.map | 3 +++ lib/libc/gen/inotify.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++ lib/libc/sys/Symbol.map | 2 ++ 4 files changed, 55 insertions(+) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 271340ca49f7..730be5f9a030 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -95,6 +95,7 @@ SRCS+= __getosreldate.c \ glob.c \ glob-compat11.c \ initgroups.c \ + inotify.c \ isatty.c \ isinf.c \ isnan.c \ diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index 890d826c3c6e..7d27c9a79645 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -463,6 +463,9 @@ FBSD_1.8 { execvpe; fdscandir; fdscandir_b; + inotify_add_watch; + inotify_init; + inotify_init1; psiginfo; rtld_get_var; rtld_set_var; diff --git a/lib/libc/gen/inotify.c b/lib/libc/gen/inotify.c new file mode 100644 index 000000000000..b3590e0f5e4d --- /dev/null +++ b/lib/libc/gen/inotify.c @@ -0,0 +1,49 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Klara, Inc. + */ + +#include "namespace.h" +#include +#include +#include +#include +#include "un-namespace.h" +#include "libc_private.h" + +/* + * Provide compatibility with libinotify, which uses different values for these + * flags. + */ +#define IN_NONBLOCK_OLD 0x80000 +#define IN_CLOEXEC_OLD 0x00800 + +int +inotify_add_watch(int fd, const char *pathname, uint32_t mask) +{ + return (inotify_add_watch_at(fd, AT_FDCWD, pathname, mask)); +} + +int +inotify_init1(int flags) +{ + struct specialfd_inotify args; + + if ((flags & IN_NONBLOCK_OLD) != 0) { + flags &= ~IN_NONBLOCK_OLD; + flags |= IN_NONBLOCK; + } + if ((flags & IN_CLOEXEC_OLD) != 0) { + flags &= ~IN_CLOEXEC_OLD; + flags |= IN_CLOEXEC; + } + args.flags = flags; + return (__sys___specialfd(SPECIALFD_INOTIFY, &args, sizeof(args))); +} + +int +inotify_init(void) +{ + return (inotify_init1(0)); +} diff --git a/lib/libc/sys/Symbol.map b/lib/libc/sys/Symbol.map index 506d88d46c34..432e89c726e4 100644 --- a/lib/libc/sys/Symbol.map +++ b/lib/libc/sys/Symbol.map @@ -426,6 +426,8 @@ FBSD_1.7 { FBSD_1.8 { getrlimitusage; + inotify_add_watch_at; + inotify_rm_watch; kcmp; setcred; };