cryptsetup, nc, sh: Skip option args when counting arguments

scop · May 26, 2018 · 11dee0e · 11dee0e
1 parent d2f55d0
commit 11dee0e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/completions/cryptsetup b/completions/cryptsetup
@@ -39,8 +39,7 @@ _cryptsetup()
                 luksResume luksHeaderBackup luksHeaderRestore' -- "$cur" ) )
         fi
     else
-        local args
-        _count_args
+        local args; _count_args "" "-!(-*)[chslSbopitTdM]"
         case $arg in
             open|create|luksOpen|loopaesOpen|tcryptOpen)
                 case $args in

diff --git a/completions/nc b/completions/nc
@@ -39,10 +39,8 @@ _nc()
     fi
 
     # Complete 1st non-option arg only
-    local i
-    for (( i=1; i < cword; i++ )); do
-        [[ ${words[i]} != -* && ${words[i-1]} != -[IiOPpsTVwXx] ]] && return
-    done
+    local args; _count_args "" "-[IiOPpsTVwXx]"
+    [[ $args -eq 1 ]] || return
 
     _known_hosts_real -- "$cur"
 } &&

diff --git a/completions/sh b/completions/sh
@@ -27,7 +27,7 @@ _sh()
     fi
 
     local args ext=
-    _count_args
+    _count_args "" "@(-c|[-+]o)"
     [[ $args -eq 1 ]] && ext=sh
     _filedir $ext
 } &&