refactor(_comp_available_interfaces): turn into a generator

akinomyoga · akinomyoga · commit f475b2ee26dd · 2023-05-31T14:06:43.000+09:00
diff --git a/bash_completion b/bash_completion
@@ -1559,10 +1559,11 @@ _kernel_versions()
 # -a: restrict to active interfaces only
 # -w: restrict to wireless interfaces only
 #
-_comp_available_interfaces()
+_comp_compgen_available_interfaces()
 {
     local PATH=$PATH:/sbin
-    local generated=$({
+    local generated
+    _comp_compgen -v generated split -- "$({
         if [[ ${1-} == -w ]]; then
             iwconfig
         elif [[ ${1-} == -a ]]; then
@@ -1571,9 +1572,8 @@ _comp_available_interfaces()
             ifconfig -a || ip -c=never link show || ip link show
         fi
     } 2>/dev/null | awk \
-        '/^[^ \t]/ { if ($1 ~ /^[0-9]+:/) { print $2 } else { print $1 } }')
-    _comp_split -l COMPREPLY "$generated" &&
-        _comp_compgen -- -W '"${COMPREPLY[@]/%[[:punct:]]/}"'
+        '/^[^ \t]/ { if ($1 ~ /^[0-9]+:/) { print $2 } else { print $1 } }')" &&
+        _comp_compgen -R -- -W '"${generated[@]/%[[:punct:]]/}"'
 }
 
 # Echo number of CPUs, falling back to 1 on failure.
diff --git a/bash_completion.d/000_bash_completion_compat.bash b/bash_completion.d/000_bash_completion_compat.bash
@@ -14,7 +14,7 @@ _comp_deprecate_func 2.12 _longopt _comp_longopt
 _comp_deprecate_func 2.12 __ltrim_colon_completions _comp_ltrim_colon_completions
 _comp_deprecate_func 2.12 _signals _comp_compgen_signals
 _comp_deprecate_func 2.12 _mac_addresses _comp_compgen_mac_addresses
-_comp_deprecate_func 2.12 _available_interfaces _comp_available_interfaces
+_comp_deprecate_func 2.12 _available_interfaces _comp_compgen_available_interfaces
 _comp_deprecate_func 2.12 _configured_interfaces _comp_compgen_configured_interfaces
 _comp_deprecate_func 2.12 _ip_addresses _comp_compgen_ip_addresses
 
diff --git a/completions/_nmcli b/completions/_nmcli
@@ -61,7 +61,7 @@ _comp_cmd_nmcli()
             return
             ;;
         iface)
-            _comp_available_interfaces
+            _comp_compgen_available_interfaces
             return
             ;;
         bssid)
diff --git a/completions/arp b/completions/arp
@@ -9,7 +9,7 @@ _comp_cmd_arp()
     # shellcheck disable=SC2254
     case $prev in
         --device | -${noargopts}i)
-            _comp_available_interfaces -a
+            _comp_compgen_available_interfaces -a
             return
             ;;
         --protocol | -${noargopts}[Ap])
diff --git a/completions/arping b/completions/arping
@@ -10,7 +10,7 @@ _comp_cmd_arping()
             return
             ;;
         -*I)
-            _comp_available_interfaces -a
+            _comp_compgen_available_interfaces -a
             return
             ;;
         -*s)
diff --git a/completions/arpspoof b/completions/arpspoof
@@ -7,7 +7,7 @@ _comp_cmd_arpspoof()
 
     case $prev in
         -i)
-            _comp_available_interfaces -a
+            _comp_compgen_available_interfaces -a
             return
             ;;
         -t)
diff --git a/completions/curl b/completions/curl
@@ -85,7 +85,7 @@ _comp_cmd_curl()
             return
             ;;
         --ftp-port | -${noargopts}P)
-            _comp_available_interfaces -a
+            _comp_compgen_available_interfaces -a
             _known_hosts_real -- "$cur"
             _comp_compgen -a ip_addresses -a
             return
@@ -99,7 +99,7 @@ _comp_cmd_curl()
             return
             ;;
         --interface)
-            _comp_available_interfaces -a
+            _comp_compgen_available_interfaces -a
             return
             ;;
         --help | -${noargopts}h)
diff --git a/completions/dhclient b/completions/dhclient
@@ -26,7 +26,7 @@ _comp_cmd_dhclient()
     if [[ $cur == -* ]]; then
         _comp_compgen_usage
     else
-        _comp_available_interfaces
+        _comp_compgen_available_interfaces
     fi
 } &&
     complete -F _comp_cmd_dhclient dhclient
diff --git a/completions/dnsspoof b/completions/dnsspoof
@@ -7,7 +7,7 @@ _comp_cmd_dnsspoof()
 
     case $prev in
         -i)
-            _comp_available_interfaces -a
+            _comp_compgen_available_interfaces -a
             return
             ;;
         -f)
diff --git a/completions/dsniff b/completions/dsniff
@@ -11,7 +11,7 @@ _comp_cmd_dsniff()
             return
             ;;
         -i)
-            _comp_available_interfaces -a
+            _comp_compgen_available_interfaces -a
             return
             ;;
     esac
diff --git a/completions/ether-wake b/completions/ether-wake
@@ -7,7 +7,7 @@ _comp_cmd_ether_wake()
 
     case $prev in
         -i)
-            _comp_available_interfaces -a
+            _comp_compgen_available_interfaces -a
             return
             ;;
         -p)
diff --git a/completions/filesnarf b/completions/filesnarf
@@ -7,7 +7,7 @@ _comp_cmd_snarf()
 
     case $prev in
         -i)
-            _comp_available_interfaces -a
+            _comp_compgen_available_interfaces -a
             return
             ;;
     esac
diff --git a/completions/gssdp-discover b/completions/gssdp-discover
@@ -10,7 +10,7 @@ _comp_cmd_gssdp_discover()
             return
             ;;
         --interface | -i)
-            _comp_available_interfaces -a
+            _comp_compgen_available_interfaces -a
             return
             ;;
         --message-type | -m)
diff --git a/completions/hping2 b/completions/hping2
@@ -9,7 +9,7 @@ _comp_cmd_hping2()
     # shellcheck disable=SC2254
     case $prev in
         --interface | -${noargopts}I)
-            _comp_available_interfaces
+            _comp_compgen_available_interfaces
             return
             ;;
         --spoof | -${noargopts}a)
diff --git a/completions/ifstat b/completions/ifstat
@@ -13,7 +13,7 @@ _comp_cmd_ifstat()
             ;;
         -${noargopts}i)
             # TODO comma separated
-            _comp_available_interfaces -a
+            _comp_compgen_available_interfaces -a
             return
             ;;
         -${noargopts}d)
diff --git a/completions/iftop b/completions/iftop
@@ -10,7 +10,7 @@ _comp_cmd_iftop()
             return
             ;;
         -i)
-            _comp_available_interfaces -a
+            _comp_compgen_available_interfaces -a
             return
             ;;
         -c)
diff --git a/completions/ip b/completions/ip
@@ -90,7 +90,7 @@ _comp_cmd_ip()
                 delete)
                     case $((cword - subcword)) in
                         1)
-                            _comp_available_interfaces
+                            _comp_compgen_available_interfaces
                             ;;
                         2)
                             _comp_compgen -- -W 'type'
@@ -104,7 +104,7 @@ _comp_cmd_ip()
                     ;;
                 set)
                     if ((cword - subcword == 1)); then
-                        _comp_available_interfaces
+                        _comp_compgen_available_interfaces
                     else
                         case $prev in
                             arp | dynamic | multicast | allmulticast | promisc | \
@@ -125,10 +125,10 @@ _comp_cmd_ip()
                     ;;
                 show)
                     if ((cword == subcword + 1)); then
-                        _comp_available_interfaces
+                        _comp_compgen_available_interfaces
                         _comp_compgen -a -- -W 'dev group up'
                     elif [[ $prev == dev ]]; then
-                        _comp_available_interfaces
+                        _comp_compgen_available_interfaces
                     elif [[ $prev == group ]]; then
                         _comp_cmd_ip__iproute2_etc group
                     fi
@@ -144,7 +144,7 @@ _comp_cmd_ip()
             case $subcmd in
                 add | change | replace)
                     if [[ $prev == dev ]]; then
-                        _comp_available_interfaces
+                        _comp_compgen_available_interfaces
                     elif [[ $prev == scope ]]; then
                         _comp_cmd_ip__iproute2_etc rt_scopes
                     else
@@ -153,7 +153,7 @@ _comp_cmd_ip()
                     ;;
                 del)
                     if [[ $prev == dev ]]; then
-                        _comp_available_interfaces
+                        _comp_compgen_available_interfaces
                     elif [[ $prev == scope ]]; then
                         _comp_cmd_ip__iproute2_etc rt_scopes
                     else
@@ -162,12 +162,12 @@ _comp_cmd_ip()
                     ;;
                 show | flush)
                     if ((cword == subcword + 1)); then
-                        _comp_available_interfaces
+                        _comp_compgen_available_interfaces
                         _comp_compgen -a -- -W 'dev scope to label dynamic
                             permanent tentative deprecated dadfailed temporary
                             primary secondary up'
                     elif [[ $prev == dev ]]; then
-                        _comp_available_interfaces
+                        _comp_compgen_available_interfaces
                     elif [[ $prev == scope ]]; then
                         _comp_cmd_ip__iproute2_etc rt_scopes
                     fi
@@ -184,7 +184,7 @@ _comp_cmd_ip()
             case $subcmd in
                 list | add | del | flush)
                     if [[ $prev == dev ]]; then
-                        _comp_available_interfaces
+                        _comp_compgen_available_interfaces
                     else
                         : # TODO
                     fi
@@ -221,7 +221,7 @@ _comp_cmd_ip()
                             $1 -c=never r 2>/dev/null || $1 r
                         } | cut -d ' ' -f 1)" -- "$cur"))
                     elif [[ $prev == dev ]]; then
-                        _comp_available_interfaces -a
+                        _comp_compgen_available_interfaces -a
                     elif [[ $prev == table ]]; then
                         _comp_compgen -- -W 'local main default'
                     else
@@ -245,7 +245,7 @@ _comp_cmd_ip()
                             suppress_ifgroup | realms | nat | goto) ;;
 
                         iif | oif)
-                            _comp_available_interfaces -a
+                            _comp_compgen_available_interfaces -a
                             ;;
                         table | lookup)
                             _comp_compgen -- -W 'local main default'
@@ -326,7 +326,7 @@ _comp_cmd_ip()
                     ;;
                 show)
                     if [[ $cword -eq $subcword+1 || $prev == dev ]]; then
-                        _comp_available_interfaces
+                        _comp_compgen_available_interfaces
                         if [[ $prev != dev ]]; then
                             _comp_compgen -a -W dev
                         fi
diff --git a/completions/iperf b/completions/iperf
@@ -35,12 +35,12 @@ _comp_cmd_iperf()
             return
             ;;
         --bind | -${noargopts}B)
-            _comp_available_interfaces -a
+            _comp_compgen_available_interfaces -a
             _comp_compgen -a ip_addresses -a
             return
             ;;
         --bind-dev)
-            _comp_available_interfaces -a
+            _comp_compgen_available_interfaces -a
             return
             ;;
         --client | -${noargopts}c)
diff --git a/completions/iwconfig b/completions/iwconfig
@@ -77,7 +77,7 @@ _comp_cmd_iwconfig()
         if [[ $cur == -* ]]; then
             _comp_compgen -- -W '--help --version'
         else
-            _comp_available_interfaces -w
+            _comp_compgen_available_interfaces -w
         fi
     else
         _comp_compgen -- -W 'essid nwid mode freq channel sens mode ap nick
diff --git a/completions/iwlist b/completions/iwlist
@@ -9,7 +9,7 @@ _comp_cmd_iwlist()
         if [[ $cur == -* ]]; then
             _comp_compgen -- -W '--help --version'
         else
-            _comp_available_interfaces -w
+            _comp_compgen_available_interfaces -w
         fi
     else
         _comp_compgen -- -W 'scan scanning freq frequency channel rate bit
diff --git a/completions/iwpriv b/completions/iwpriv
@@ -20,7 +20,7 @@ _comp_cmd_iwpriv()
         if [[ $cur == -* ]]; then
             _comp_compgen -- -W '--help --version'
         else
-            _comp_available_interfaces -w
+            _comp_compgen_available_interfaces -w
         fi
     else
         _comp_compgen -- -W '--all roam port'
diff --git a/completions/iwspy b/completions/iwspy
@@ -9,7 +9,7 @@ _comp_cmd_iwspy()
         if [[ $cur == -* ]]; then
             _comp_compgen -- -W '--help --version'
         else
-            _comp_available_interfaces -w
+            _comp_compgen_available_interfaces -w
         fi
     else
         _comp_compgen -- -W 'setthr getthr off'
diff --git a/completions/macof b/completions/macof
@@ -7,7 +7,7 @@ _comp_cmd_macof()
 
     case $prev in
         -i)
-            _comp_available_interfaces -a
+            _comp_compgen_available_interfaces -a
             return
             ;;
     esac
diff --git a/completions/mii-diag b/completions/mii-diag
@@ -18,7 +18,7 @@ _comp_cmd_mii_diag()
     if [[ $cur == -* ]]; then
         _comp_compgen_help
     else
-        _comp_available_interfaces -a
+        _comp_compgen_available_interfaces -a
     fi
 } &&
     complete -F _comp_cmd_mii_diag -o default mii-diag
diff --git a/completions/mii-tool b/completions/mii-tool
@@ -26,7 +26,7 @@ _comp_cmd_mii_tool()
         _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
-        _comp_available_interfaces -a
+        _comp_compgen_available_interfaces -a
     fi
 } &&
     complete -F _comp_cmd_mii_tool -o default mii-tool
diff --git a/completions/mkinitrd b/completions/mkinitrd
@@ -15,7 +15,7 @@ _comp_cmd_mkinitrd()
             return
             ;;
         --net-dev)
-            _comp_available_interfaces
+            _comp_compgen_available_interfaces
             return
             ;;
     esac
diff --git a/completions/nethogs b/completions/nethogs
@@ -19,7 +19,7 @@ _comp_cmd_nethogs()
         return
     fi
 
-    _comp_available_interfaces -a
+    _comp_compgen_available_interfaces -a
 } &&
     complete -F _comp_cmd_nethogs nethogs
 
diff --git a/completions/ngrep b/completions/ngrep
@@ -14,7 +14,7 @@ _comp_cmd_ngrep()
             return
             ;;
         -d)
-            _comp_available_interfaces -a
+            _comp_compgen_available_interfaces -a
             _comp_compgen -a -- -W 'any'
             return
             ;;
diff --git a/completions/nmap b/completions/nmap
@@ -15,7 +15,7 @@ _comp_cmd_nmap()
             return
             ;;
         -e)
-            _comp_available_interfaces -a
+            _comp_compgen_available_interfaces -a
             return
             ;;
         -b | --dns-servers)
diff --git a/completions/ping b/completions/ping
@@ -12,7 +12,7 @@ _comp_cmd_ping()
             return
             ;;
         -*I)
-            _comp_available_interfaces -a
+            _comp_compgen_available_interfaces -a
             return
             ;;
         -*M)
diff --git a/completions/resolvconf b/completions/resolvconf
diff --git a/completions/route b/completions/route
diff --git a/completions/ssh b/completions/ssh
diff --git a/completions/sshow b/completions/sshow
diff --git a/completions/tcpdump b/completions/tcpdump
diff --git a/completions/tcpkill b/completions/tcpkill
diff --git a/completions/tcpnice b/completions/tcpnice
diff --git a/completions/urlsnarf b/completions/urlsnarf
