Merge pull request #1040 from scop/fix/misc

fix: misc from #1028, #1029

Author: scop

bash_completion

@@ -1229,7 +1229,7 @@ _comp_variable_assignments()
     case $prev in
         TZ)
             cur=/usr/share/zoneinfo/$cur
-            _comp_compgen -a filedir
+            _comp_compgen_filedir
             if ((${#COMPREPLY[@]})); then
                 for i in "${!COMPREPLY[@]}"; do
                     if [[ ${COMPREPLY[i]} == *.tab ]]; then
@@ -2050,7 +2050,7 @@ _comp_compgen_allowed_groups()
 # @since 2.12
 _comp_selinux_users()
 {
-    _comp_compgen -a split -- "$(semanage user -nl 2>/dev/null |
+    _comp_compgen_split -- "$(semanage user -nl 2>/dev/null |
         awk '{ print $1 }')"
 }
 

completions/cvs

@@ -56,7 +56,7 @@ _comp_cmd_cvs()
     local cur prev words cword comp_args
     _comp_initialize -n : -- "$@" || return
 
-    local count mode="" i cvsroot="" has_cvsroot="" cvsroots pwd
+    local count mode="" i cvsroot="" has_cvsroot="" pwd
     local -a flags files entries changed newremoved
 
     local noargopts='!(-*|*[d]*)'

completions/openssl

@@ -2,7 +2,7 @@
 
 _comp_cmd_openssl__compgen_sections()
 {
-    local config f
+    local config i f
 
     # check if a specific configuration file is used
     for ((i = 2; i < cword; i++)); do

completions/ssh

@@ -8,7 +8,7 @@ _comp_cmd_ssh__compgen_queries()
         key-plain key-sig protocol-version compression sig ciphers macs
         kexalgorithms pubkeyacceptedkeytypes hostkeyalgorithms
         hostbasedkeytypes hostbasedacceptedkeytypes)
-    _comp_compgen -ac "${cur,,}" -- -W '"${ret[@]}" help"'
+    _comp_compgen -c "${cur,,}" -- -W '"${ret[@]}" help"'
 }
 
 # @since 2.12
@@ -37,7 +37,7 @@ _comp_cmd_ssh__compgen_ciphers()
     [[ ${ret-} ]] || ret=(3des-cbc aes128-cbc aes192-cbc aes256-cbc
         aes128-ctr aes192-ctr aes256-ctr arcfour128 arcfour256 arcfour
         blowfish-cbc cast128-cbc)
-    _comp_compgen -a -- -W '"${ret[@]}"'
+    _comp_compgen -- -W '"${ret[@]}"'
 }
 
 _comp_cmd_ssh__compgen_macs()
@@ -46,7 +46,7 @@ _comp_cmd_ssh__compgen_macs()
     _comp_compgen -v ret -i ssh query "$1" mac
     [[ ${ret-} ]] || ret=(hmac-md5 hmac-sha1 [email protected]
         hmac-ripemd160 hmac-sha1-96 hmac-md5-96)
-    _comp_compgen -a -- -W '"${ret[@]}"'
+    _comp_compgen -- -W '"${ret[@]}"'
 }
 
 # @since 2.12