From 218e074be676afb77697717eebc0dcc713af2875 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Fri, 16 Aug 2024 09:39:44 -0400 Subject: docs: Document the new -mount vs. -xdev behaviour Fixes: 33b85e1 ("Implement POSIX 2024's -mount") --- completions/bfs.fish | 2 +- completions/bfs.zsh | 2 +- docs/bfs.1 | 7 ++++--- src/parse.c | 3 +-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/completions/bfs.fish b/completions/bfs.fish index 0b846f8..7182bee 100644 --- a/completions/bfs.fish +++ b/completions/bfs.fish @@ -42,7 +42,7 @@ complete -c bfs -o ignore_readdir_race -d "Don't report an error if the file tre complete -c bfs -o noignore_readdir_race -d "Report an error if the file tree is modified during the search" complete -c bfs -o maxdepth -d "Ignore files deeper than specified number" -x complete -c bfs -o mindepth -d "Ignore files shallower than specified number" -x -complete -c bfs -o mount -d "Don't descend into other mount points" +complete -c bfs -o mount -d "Exclude mount points" complete -c bfs -o noerror -d "Ignore any errors that occur during traversal" complete -c bfs -o nohidden -d "Exclude hidden files and directories" complete -c bfs -o noleaf -d "Ignored; for compatibility with GNU find" diff --git a/completions/bfs.zsh b/completions/bfs.zsh index 3524d30..3825e09 100644 --- a/completions/bfs.zsh +++ b/completions/bfs.zsh @@ -41,7 +41,7 @@ args=( '*-noignore_readdir_race[do not report an error if bfs detects file tree is modified during search]' '*-maxdepth[ignore files deeper than N]:maximum search depth' '*-mindepth[ignore files shallower than N]:minimum search depth' - "*-mount[don't descend into other mount points]" + "*-mount[exclude mount points]" '*-noerror[ignore any errors that occur during traversal]' '*-nohidden[exclude hidden files]' '*-noleaf[ignored, for compatibility with GNU find]' diff --git a/docs/bfs.1 b/docs/bfs.1 index dc3b7b0..4358391 100644 --- a/docs/bfs.1 +++ b/docs/bfs.1 @@ -316,9 +316,7 @@ Ignore files deeper/shallower than .RE .TP .B \-mount -Don't descend into other mount points (same as -.B \-xdev -for now, but will skip mount points entirely in the future). +Exclude mount points entirely from the results. .TP .B \-noerror Ignore any errors that occur during traversal. @@ -384,6 +382,9 @@ Turn on or off warnings about the command line. .TP .B \-xdev Don't descend into other mount points. +Unlike +.BR \-mount , +the mount point itself is still included. .SH TESTS .TP .B \-acl diff --git a/src/parse.c b/src/parse.c index fe0c10d..90b6177 100644 --- a/src/parse.c +++ b/src/parse.c @@ -2765,8 +2765,7 @@ static struct bfs_expr *parse_help(struct bfs_parser *parser, int arg1, int arg2 cfprintf(cout, " ${blu}-mindepth${rs} ${bld}N${rs}\n"); cfprintf(cout, " Ignore files deeper/shallower than ${bld}N${rs}\n"); cfprintf(cout, " ${blu}-mount${rs}\n"); - cfprintf(cout, " Don't descend into other mount points (same as ${blu}-xdev${rs} for now, but will\n"); - cfprintf(cout, " skip mount points entirely in the future)\n"); + cfprintf(cout, " Exclude mount points entirely from the results\n"); cfprintf(cout, " ${blu}-noerror${rs}\n"); cfprintf(cout, " Ignore any errors that occur during traversal\n"); cfprintf(cout, " ${blu}-nohidden${rs}\n"); -- cgit v1.2.3