Merge branch 'main' into find2fdfind2fd

3 files changed, 17 insertions, 23 deletions

diff --git a/completions/bfs.bash b/completions/bfs.bash
index f734ab1..6fd82c8 100644
--- a/completions/bfs.bash
+++ b/completions/bfs.bash
@@ -1,21 +1,8 @@
-# bash completion script for bfs
+# Copyright © Benjamin Mundt <benMundt@ibm.com>
+# Copyright © Tavian Barnes <tavianator@tavianator.com>
+# SPDX-License-Identifier: 0BSD
 
-############################################################################
-# bfs                                                                      #
-# Copyright (C) 2020 Benjamin Mundt <benMundt@ibm.com>                     #
-# Copyright (C) 2021 Tavian Barnes <tavianator@tavianator.com>             #
-#                                                                          #
-# Permission to use, copy, modify, and/or distribute this software for any #
-# purpose with or without fee is hereby granted.                           #
-#                                                                          #
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES #
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF         #
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR  #
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES   #
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN    #
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF  #
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.           #
-############################################################################
+# bash completion script for bfs
 
 _bfs() {
     local cur prev words cword
@@ -31,6 +18,7 @@ _bfs() {
         -fstype
         -gid
         -group
+        -j
         -ok
         -okdir
         -regextype
@@ -44,12 +32,14 @@ _bfs() {
     # (e.g. because they are numeric, glob, regexp, time, etc.)
     local nocomp=(
         -{a,B,c,m}{min,since,time}
+        -context
         -ilname
         -iname
         -inum
         -ipath
         -iregex
         -iwholename
+        -limit
         -links
         -lname
         -maxdepth
@@ -107,8 +97,6 @@ _bfs() {
         -depth
         -follow
         -ignore_readdir_race
-        -maxdepth
-        -mindepth
         -mount
         -nocolor
         -noignore_readdir_race
diff --git a/completions/bfs.fish b/completions/bfs.fish
index 3f399e7..24b0ad9 100644
--- a/completions/bfs.fish
+++ b/completions/bfs.fish
@@ -20,6 +20,7 @@ complete -c bfs -o f -d "Treat specified path as a path to search" -a "(__fish_c
 complete -c bfs -o D -d "Turn on a debugging flag" -a $debug_flag_comp -x
 complete -c bfs -s O -d "Enable specified optimization level" -a $optimization_comp -x
 complete -c bfs -o S -d "Choose the search strategy" -a $strategy_comp -x
+complete -c bfs -s j -d "Use this many threads" -x
 
 # Operators
 
@@ -70,6 +71,7 @@ complete -c bfs -o Btime -d "Find files birthed specified number of days ago" -x
 complete -c bfs -o ctime -d "Find files changed specified number of days ago" -x
 complete -c bfs -o mtime -d "Find files modified specified number of days ago" -x
 complete -c bfs -o capable -d "Find files with capabilities set"
+complete -c bfs -o context -d "Find files by SELinux context" -x
 complete -c bfs -o depth -d "Find files with specified number of depth" -x
 complete -c bfs -o empty -d "Find empty files/directories"
 complete -c bfs -o executable -d "Find files the current user can execute"
@@ -133,6 +135,7 @@ complete -c bfs -o fls -d "Like -ls, but write to specified file" -F
 complete -c bfs -o fprint -d "Like -print, but write to specified file" -F
 complete -c bfs -o fprint0 -d "Like -print0, but write to specified file" -F
 complete -c bfs -o fprintf -d "Like -printf, but write to specified file" -F
+complete -c bfs -o limit -d "Limit the number of results" -x
 complete -c bfs -o ls -d "List files like ls -dils"
 complete -c bfs -o print -d "Print the path to the found file"
 complete -c bfs -o print0 -d "Like -print, but use the null character as a separator rather than newlines"
diff --git a/completions/bfs.zsh b/completions/bfs.zsh
index 3d7dc3a..432ab8c 100644
--- a/completions/bfs.zsh
+++ b/completions/bfs.zsh
@@ -10,7 +10,7 @@ args=(
     '-D[print diagnostics]:debug option:(cost exec opt rates search stat time tree all help)'
     '-E[use extended regular expressions with -regex/-iregex]'
     '-f[specify file hierarchy to traverse]:path:_directories'
-    '-O+[enable query optimisation]:level:(1 2 3)'
+    '-O+[enable query optimisation]:level:(0 1 2 3 4 fast)'
     '-s[traverse directories in sorted order]'
     '-X[warn if filename contains characters special to xargs]'
     "-x[don't span filesystems]"
@@ -19,6 +19,7 @@ args=(
     '(-L -P)-H[only follow symlinks when resolving command-line arguments]'
     "-S[select search method]:value:(bfs dfs ids eds)"
     '-f[treat path as path to search]:path:_files -/'
+    '-j+[use this many threads]:threads:'
 
     # Operators
     '*-and'
@@ -73,6 +74,7 @@ args=(
     '*-mtime[find files modified N days ago]:modification time (days):->times'
 
     '*-capable[find files with POSIX.1e capabilities set]'
+    '*-context[find files by SELinux context]:pattern'
     # -depth without parameters exist above. I don't know how to handle this gracefully
     '*-empty[find empty files/directories]'
     '*-executable[find files the current user can execute]'
@@ -81,7 +83,7 @@ args=(
     '*-false[always false]'
     '*-true[always true]'
     '*-fstype[find files on file systems with the given type]:file system type:_file_systems'
-    
+
     '*-gid[find files owned by group ID N]:numeric group ID:'
     '*-group[find files owned by group NAME]:group:_groups'
     '*-uid[find files owned by user ID N]:numeric user ID'
@@ -117,7 +119,7 @@ args=(
     '*-xattr[find files with extended attributes]'
     '*-xattrname[find files with extended attribute NAME]:name:'
     '*-xtype[find files of the given type following links when -type would not, and vice versa]:file type:((b\:block\ device c\:character\ device d\:directory p\:named\ pipe f\:normal\ file l\:symbolic\ link s\:socket w\:whiteout D\:Door))'
-    
+
     # Actions
     '*-delete[delete any found files (-implies -depth)]'
     '*-rm[delete any found files (-implies -depth)]'
@@ -126,13 +128,14 @@ args=(
     '*-execdir[execute a command in the same directory as the found files]:program: _command_names -e:*(\;|+)::program arguments: _normal'
     '*-ok[prompt the user whether to execute a command]:program: _command_names -e:*(\;|+)::program arguments: _normal'
     '*-okdir[prompt the user whether to execute a command in the same directory as the found files]:program: _command_names -e:*(\;|+)::program arguments: _normal'
-    
+
     '-exit[exit with status if found, default 0]'
     '*-fls[list files like ls -dils, but write to FILE instead of standard output]:output file:_files'
     '*-fprint[print the path to the found file, but write to FILE instead of standard output]:output file:_files'
     '*-fprint0[print the path to the found file using null character as separator, but write to FILE instead of standard output]:output file:_files'
     '*-fprintf[print according to format string, but write to FILE instead of standard output]:output file:_files:output format'
 
+    '*-limit[quit after N results]:maximum result count'
     '*-ls[list files like ls -dils]'
     '*-print[print the path to the found file]'
     '*-print0[print the path to the found file using null character as separator]'