*: Protect _known_hosts_real from user input treated as options

Avoids e.g. errors like $ xgamma -display --<TAB> error: _known_hosts_real: missing mandatory argument CWORD
scop · Jul 9, 2017 · 8706bc1 · 8706bc1
1 parent 3708590
commit 8706bc1
Show file tree

Hide file tree

Showing 46 changed files with 75 additions and 75 deletions.
diff --git a/completions/arping b/completions/arping
@@ -24,7 +24,7 @@ _arping()
         return
     fi
 
-    _known_hosts_real "$cur"
+    _known_hosts_real -- "$cur"
 } &&
 complete -F _arping arping
 

diff --git a/completions/arpspoof b/completions/arpspoof
@@ -11,15 +11,15 @@ _arpspoof()
             return
             ;;
         -t)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
     esac
 
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_usage "$1" )' -- "$cur" ) )
     else
-        _known_hosts_real "$cur"
+        _known_hosts_real -- "$cur"
     fi
 
 } &&

diff --git a/completions/chronyc b/completions/chronyc
@@ -5,7 +5,7 @@ _chronyc_command_args()
     local -a args=( $( compgen -W "$( $1 help 2>/dev/null | \
         awk '/^'$prev'\s[^ []/ { gsub("\\|", " ", $2); print $2 }' )" ) )
     case $args in
-        \<address\>) _known_hosts_real "$cur" ;;
+        \<address\>) _known_hosts_real -- "$cur" ;;
         \<*) ;;
         *) COMPREPLY+=( $( compgen -W '${args[@]}' -- "$cur" ) ) ;;
     esac
@@ -21,7 +21,7 @@ _chronyc()
             return
             ;;
         -h)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
     esac
@@ -50,7 +50,7 @@ _chronyc()
             fi
             ;;
         2)
-            [[ $prev == @(peer|server) ]] && _known_hosts_real "$cur"
+            [[ $prev == @(peer|server) ]] && _known_hosts_real -- "$cur"
             ;;
     esac
 } &&

diff --git a/completions/curl b/completions/curl
@@ -68,7 +68,7 @@ _curl()
             return
             ;;
         -x|--proxy|--socks4|--socks4a|--socks5|--socks5-hostname)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
         --pubkey)

diff --git a/completions/dhclient b/completions/dhclient
@@ -11,7 +11,7 @@ _dhclient()
             return
             ;;
         -s)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
     esac

diff --git a/completions/freeciv-gtk2 b/completions/freeciv-gtk2
@@ -15,7 +15,7 @@ _civclient()
             return
             ;;
         -s|--server)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
     esac

diff --git a/completions/gkrellm b/completions/gkrellm
@@ -15,7 +15,7 @@ _gkrellm()
             return
             ;;
         -s|--server)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
         -l|--logfile)

diff --git a/completions/hping2 b/completions/hping2
@@ -11,7 +11,7 @@ _hping2()
             return
             ;;
         -a|--spoof)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
         -o|--tos)
@@ -27,7 +27,7 @@ _hping2()
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_help "$1" )' -- "$cur" ) )
     else
-        _known_hosts_real "$cur"
+        _known_hosts_real -- "$cur"
     fi
 } &&
 complete -F _hping2 hping hping2 hping3

diff --git a/completions/iperf b/completions/iperf
@@ -25,7 +25,7 @@ _iperf()
             return
             ;;
         -c|--client)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
         -x|--reportexclude)

diff --git a/completions/ipmitool b/completions/ipmitool
@@ -30,7 +30,7 @@ _ipmitool()
             return
             ;;
         -H)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
         -f|-S|-O)

diff --git a/completions/jps b/completions/jps
@@ -17,7 +17,7 @@ _jps()
         COMPREPLY=( $( compgen -W "-q -m -l -v -V -J -help" -- "$cur" ) )
         [[ $COMPREPLY == -J* ]] && compopt -o nospace
     else
-        _known_hosts_real "$cur"
+        _known_hosts_real -- "$cur"
     fi
 } &&
 complete -F _jps jps

diff --git a/completions/ktutil b/completions/ktutil
@@ -36,7 +36,7 @@ _ktutil()
             return
             ;;
         -a|--admin-server)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
         -r|--realm)

diff --git a/completions/ldapsearch b/completions/ldapsearch
@@ -17,7 +17,7 @@ _ldapsearch()
 
     case $prev in
         -h)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
         -H)
@@ -60,7 +60,7 @@ _ldapaddmodify()
 
     case $prev in
         -h)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
         -H)
@@ -90,7 +90,7 @@ _ldapdelete()
 
     case $prev in
         -h)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
         -H)
@@ -120,7 +120,7 @@ _ldapcompare()
 
     case $prev in
         -h)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
         -H)
@@ -150,7 +150,7 @@ _ldapmodrdn()
 
     case $prev in
         -h)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
         -H)
@@ -180,7 +180,7 @@ _ldapwhoami()
 
     case $prev in
         -h)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
         -H)
@@ -210,7 +210,7 @@ _ldappasswd()
 
     case $prev in
         -h)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
         -H)

diff --git a/completions/ldapvi b/completions/ldapvi
@@ -7,7 +7,7 @@ _ldapvi()
 
     case $prev in
         -h|--host)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
         -Y|--sasl-mech)

diff --git a/completions/lftp b/completions/lftp
@@ -22,7 +22,7 @@ _lftp()
 
     COMPREPLY=( $( compgen -W \
         '$( cut -f 1 -s ~/.lftp/bookmarks ${XDG_DATA_HOME:-$HOME/.local/share}/lftp/bookmarks 2>/dev/null )' -- "$cur" ) )
-    _known_hosts_real "$cur"
+    _known_hosts_real -- "$cur"
 } &&
 complete -F _lftp lftp
 

diff --git a/completions/medusa b/completions/medusa
@@ -7,7 +7,7 @@ _medusa()
 
     case $prev in
         -h)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
         -H|-U|-P|-C|-O)

diff --git a/completions/munin-node-configure b/completions/munin-node-configure
@@ -15,7 +15,7 @@ _munin_node_configure()
             return
             ;;
         --snmp)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
         --snmpversion)

diff --git a/completions/munin-update b/completions/munin-update
@@ -11,7 +11,7 @@ _munin_update()
             return
             ;;
         --host)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
     esac

diff --git a/completions/mussh b/completions/mussh
@@ -34,7 +34,7 @@ _mussh()
             return
             ;;
         -p|-h)
-            [[ $cur == *@* ]] && _user_at_host || _known_hosts_real -a "$cur"
+            [[ $cur == *@* ]] && _user_at_host || _known_hosts_real -a -- "$cur"
             return
             ;;
         -c)

diff --git a/completions/mysql b/completions/mysql
@@ -16,7 +16,7 @@ _mysql()
             ;;
 
         -h|--host)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
         --default-character-set)

diff --git a/completions/mysqladmin b/completions/mysqladmin
@@ -11,7 +11,7 @@ _mysqladmin()
             return
             ;;
         -h|--host)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
         --character-sets-dir|--ssl-capath)

diff --git a/completions/nc b/completions/nc
@@ -23,7 +23,7 @@ _nc()
             return
             ;;
         -x)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
     esac
@@ -39,7 +39,7 @@ _nc()
         [[ ${words[i]} != -* && ${words[i-1]} != -[IiOPpsTVwXx] ]] && return
     done
 
-    _known_hosts_real "$cur"
+    _known_hosts_real -- "$cur"
 } &&
 complete -F _nc nc
 

diff --git a/completions/nmap b/completions/nmap
@@ -19,7 +19,7 @@ _nmap()
             return
             ;;
         -b|--dns-servers)
-            _known_hosts_real "$cur"
+            _known_hosts_real -- "$cur"
             return
             ;;
     esac
@@ -42,7 +42,7 @@ _nmap()
             -A --datadir --send-eth --send-ip --privilege--unprivileged -V
             -h' -- "$cur" ) )
     else
-        _known_hosts_real "$cur"
+        _known_hosts_real -- "$cur"
     fi
 } &&
 complete -F _nmap nmap

diff --git a/completions/nslookup b/completions/nslookup
@@ -45,7 +45,7 @@ _nslookup()
     local args
     _count_args =
     if [[ $args -le 2 ]]; then
-        _known_hosts_real "$cur"
+        _known_hosts_real -- "$cur"
         [[ $args -eq 1 && $cur == @(|-) ]] && COMPREPLY+=( - )
     fi
 } &&
@@ -79,7 +79,7 @@ _host()
         return
     fi
 
-    _known_hosts_real "$cur"
+    _known_hosts_real -- "$cur"
 } &&
 complete -F _host host
 

diff --git a/completions/ntpdate b/completions/ntpdate
@@ -27,7 +27,7 @@ _ntpdate()
     if [[ "$cur" == -* ]]; then
         COMPREPLY=( $( compgen -W '$( _parse_usage "$1" )' -- "$cur" ) )
     else
-        _known_hosts_real "$cur"
+        _known_hosts_real -- "$cur"
     fi
 } &&
 complete -F _ntpdate ntpdate

diff --git a/completions/openssl b/completions/openssl
@@ -88,7 +88,7 @@ _openssl()
                 return
                 ;;
             -connect)
-                _known_hosts_real "$cur"
+                _known_hosts_real -- "$cur"
                 return
                 ;;
             -starttls)

diff --git a/completions/ping b/completions/ping
@@ -54,7 +54,7 @@ _ping()
         return
     fi
 
-    _known_hosts_real "$cur"
+    _known_hosts_real -- "$cur"
 } &&
 complete -F _ping ping ping6