From nobody Mon Jan 22 01:35:46 2024 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 4TJCTt6wfxz58BRd; Mon, 22 Jan 2024 01:35: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJCTt6Jqyz4mjq; Mon, 22 Jan 2024 01:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705887346; 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=ijPdEU5hQVeAz1v6p46RPQFdtCuoWmJc56bQ5KwGSbU=; b=R7vmYoO0yXHLqu6lNcSANEgTEH6kbZJaXzjvZig0BbQZAel2VYfv2zoXxPXHbkMQHeANnR Aq6kevf6trj4e1oWGqNhGthuzS28dcdlJjGzelzyHpzZkBMIFA7PBgX9R3myudAbb0oQv/ Q7NJRUJaaJpvawxD/qDs57gc4iI+0dE3w4VotPM+h9N4p4cETOxFIHrfPklXeNNjJb9o0Z 4nf1xiBNWrGx5voRYCdFWBoKMAgd8l+kG5EC3RnIcWHXr4rmYDpX4qcZ6XGiyLyX0pSB8o gsn8HvZtOFXpC2Y5tT8GGosQWItnjRw8j+Xt0BgRDo5DfCRQzfzPsqCAckQvYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705887346; 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=ijPdEU5hQVeAz1v6p46RPQFdtCuoWmJc56bQ5KwGSbU=; b=WXaa+geO+1bigNy73M/u0uv77OCwDMQdbJ50uSMKlnQUW8Z0XjpZpl1gdV8wKx7ATzXRta avlNHv1KyukuGnLRKe6WntUc4MIa/9CpJ2/9l0EjkPDgx4Fe1p23bfI3DRcAGxDWplKYkg e6rVJNXi/mH92dB/7FYrRQ3CeeQL6T8JGa776m3RYR9lF9PEIuJU0KSQWD2wHxybccjwTp LLTpIvhKdOLTMerwBBVnI+FcvenThoXEdYRYm3cp9RpZ7KniuAlvL/Sncn9QXoShZs3o1A QxqcY5j3IqRepPI/D1NpS7hOishT83E+zMjU6ONteiCE0WTY8d5TR5MrX/Se+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705887346; a=rsa-sha256; cv=none; b=dxlIshMdJ4f7RuLw8fkd2DzUAXjAa/9cDXQY0P/23z3u2UmetXSShyZrOq2nx6lOrXjrtL JyuO/SkxJ/ABDYBpR8Vqhdrikr3WxHw2vOEck4IKauJ56UtxqP6GtgucDCuojQ7YUWNCdB ktkbK6Gry/vTdU12Q8PHQNyS5wAqv0Ibc21DQ8mw5J9PVGQb//LgLTnUoAmuU5N9qT68KS iQlr2mkf36zMKqEnvS5nm0ZYXbQJXOgJt/P1EePuQq8XHO2kuXC9esp6eFpS5ji5mBbl0O DIuSwz322MIiJ5O+Gb5yLFzHHVhjggC71sQ2w+yOWB3Y+JZBoh02MhZFA/1hQw== 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 4TJCTt5KTfzhvy; Mon, 22 Jan 2024 01:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40M1ZkNv002993; Mon, 22 Jan 2024 01:35:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M1ZkpM002990; Mon, 22 Jan 2024 01:35:46 GMT (envelope-from git) Date: Mon, 22 Jan 2024 01:35:46 GMT Message-Id: <202401220135.40M1ZkpM002990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e4b646ce1610 - main - find: Add -readable, -writable & -executable options 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4b646ce16105efc943bc8ac2242a2220dfe18d8 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e4b646ce16105efc943bc8ac2242a2220dfe18d8 commit e4b646ce16105efc943bc8ac2242a2220dfe18d8 Author: Ricardo Branco AuthorDate: 2024-01-21 19:53:05 +0000 Commit: John Baldwin CommitDate: 2024-01-22 01:33:46 +0000 find: Add -readable, -writable & -executable options Reviewed by: jhb, Mina Galić Pull Request: https://github.com/freebsd/freebsd-src/pull/1080 --- usr.bin/find/extern.h | 3 +++ usr.bin/find/find.1 | 20 +++++++++++++++++++- usr.bin/find/function.c | 39 +++++++++++++++++++++++++++++++++++++++ usr.bin/find/option.c | 3 +++ 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/usr.bin/find/extern.h b/usr.bin/find/extern.h index a1bd5e6d16a5..feb2e0202056 100644 --- a/usr.bin/find/extern.h +++ b/usr.bin/find/extern.h @@ -86,6 +86,7 @@ exec_f f_delete; exec_f f_depth; exec_f f_empty; exec_f f_exec; +exec_f f_executable; exec_f f_expr; exec_f f_false; exec_f f_flags; @@ -107,11 +108,13 @@ exec_f f_print; exec_f f_print0; exec_f f_prune; exec_f f_quit; +exec_f f_readable; exec_f f_regex; exec_f f_size; exec_f f_sparse; exec_f f_type; exec_f f_user; +exec_f f_writable; extern int ftsoptions, ignore_readdir_race, isdepth, isoutput; extern int issort, isxargs; diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1 index 856961d02395..635d42656bad 100644 --- a/usr.bin/find/find.1 +++ b/usr.bin/find/find.1 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 15, 2024 +.Dd January 21, 2024 .Dt FIND 1 .Os .Sh NAME @@ -465,6 +465,12 @@ if at least one invocation of returns a non-zero exit status, .Nm will return a non-zero exit status. +.It Ic -executable +Matches files which are executable by the current user. +This test makes use of the +.Xr access 2 +system call, and so can be fooled by NFS servers which do UID mapping (or root-squashing). +This is a GNU find extension. .It Ic -flags Oo Cm - Ns | Ns Cm + Oc Ns Ar flags , Ns Ar notflags The flags are specified using symbolic names (see .Xr chflags 1 ) . @@ -829,6 +835,12 @@ option was specified. Causes .Nm to terminate immediately. +.It Ic -readable +Matches files which are readable by the current user. +This test makes use of the +.Xr access 2 +system call, and so can be fooled by NFS servers which do UID mapping (or root-squashing). +This is a GNU find extension. .It Ic -regex Ar pattern True if the whole path of the file matches .Ar pattern @@ -925,6 +937,12 @@ is treated as a user ID. The same thing as .Ic -path , for GNU find compatibility. +.It Ic -writable +Matches files which are writable by the current user. +This test makes use of the +.Xr access 2 +system call, and so can be fooled by NFS servers which do UID mapping (or root-squashing). +This is a GNU find extension. .El .Sh OPERATORS The primaries may be combined using the following operators. diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c index f96a086cbda3..ef610903cc00 100644 --- a/usr.bin/find/function.c +++ b/usr.bin/find/function.c @@ -1808,3 +1808,42 @@ f_quit(PLAN *plan __unused, FTSENT *entry __unused) } /* c_quit == c_simple */ + +/* + * -readable + * + * File is readable + */ +int +f_readable(PLAN *plan __unused, FTSENT *entry) +{ + return (access(entry->fts_path, R_OK) == 0); +} + +/* c_readable == c_simple */ + +/* + * -writable + * + * File is writable + */ +int +f_writable(PLAN *plan __unused, FTSENT *entry) +{ + return (access(entry->fts_path, W_OK) == 0); +} + +/* c_writable == c_simple */ + +/* + * -executable + * + * File is executable + */ +int +f_executable(PLAN *plan __unused, FTSENT *entry) +{ + return (access(entry->fts_path, X_OK) == 0); +} + +/* c_executable == c_simple */ diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c index 166fc75e9c51..99c67eed8cd9 100644 --- a/usr.bin/find/option.c +++ b/usr.bin/find/option.c @@ -75,6 +75,7 @@ static OPTION const options[] = { { "-empty", c_empty, f_empty, 0 }, { "-exec", c_exec, f_exec, 0 }, { "-execdir", c_exec, f_exec, F_EXECDIR }, + { "-executable", c_simple, f_executable, 0 }, { "-false", c_simple, f_false, 0 }, #if HAVE_STRUCT_STAT_ST_FLAGS { "-flags", c_flags, f_flags, 0 }, @@ -149,6 +150,7 @@ static OPTION const options[] = { // -printf { "-prune", c_simple, f_prune, 0 }, { "-quit", c_simple, f_quit, 0 }, + { "-readable", c_simple, f_readable, 0 }, { "-regex", c_regex, f_regex, 0 }, { "-samefile", c_samefile, f_inum, 0 }, { "-size", c_size, f_size, 0 }, @@ -158,6 +160,7 @@ static OPTION const options[] = { { "-uid", c_user, f_user, 0 }, { "-user", c_user, f_user, 0 }, { "-wholename", c_name, f_path, 0 }, + { "-writable", c_simple, f_writable, 0 }, { "-xdev", c_xdev, f_always_true, 0 }, // -xtype };