fix(ebtables,iptables): quote table name

Co-authored-by: Ville Skyttä <ville.skytta@iki.fi>

Author: akinomyoga

completions/ebtables

@@ -8,35 +8,36 @@ _comp_cmd_ebtables()
     local table="" chain='s/^Bridge chain: \([^ ,]\{1,\}\).*$/\1/p' \
         targets='ACCEPT DROP CONTINUE RETURN'
 
+    local IFS=$' \t\n' # for ${table:+-t "$table"}
     [[ ${words[*]} =~ [[:space:]]-(t|-table=?)[[:space:]]*([^[:space:]]+) ]] &&
-        table="-t ${BASH_REMATCH[2]}"
+        table=${BASH_REMATCH[2]}
 
     local noargopts='!(-*|*[AIDPFXLZtj]*)'
     # shellcheck disable=SC2254
     case $prev in
         -${noargopts}[AIDPFXLZ])
-            COMPREPLY=($(compgen -W '`"$1" $table -L 2>/dev/null | \
+            COMPREPLY=($(compgen -W '`"$1" ${table:+-t "$table"} -L 2>/dev/null | \
                 command sed -ne "$chain"`' -- "$cur"))
             ;;
         -${noargopts}t)
             COMPREPLY=($(compgen -W 'nat filter broute' -- "$cur"))
             ;;
         -${noargopts}j)
-            if [[ $table == "-t filter" || ! $table ]]; then
+            if [[ $table == "filter" || ! $table ]]; then
                 COMPREPLY=($(compgen -W '$targets
-                $("$1" $table -L 2>/dev/null | \
+                $("$1" ${table:+-t "$table"} -L 2>/dev/null | \
                   command sed -n -e "s/INPUT\|OUTPUT\|FORWARD//" \
                                  -e "$chain")' \
                     -- "$cur"))
-            elif [[ $table == "-t nat" ]]; then
+            elif [[ $table == "nat" ]]; then
                 COMPREPLY=($(compgen -W '$targets
-                $("$1" $table -L 2>/dev/null | \
+                $("$1" -t "$table" -L 2>/dev/null | \
                   command sed -n -e "s/OUTPUT|PREROUTING|POSTROUTING//" \
                                  -e "$chain")' \
                     -- "$cur"))
-            elif [[ $table == "-t broute" ]]; then
+            elif [[ $table == "broute" ]]; then
                 COMPREPLY=($(compgen -W 'ACCEPT DROP
-                $("$1" $table -L 2>/dev/null | \
+                $("$1" -t "$table" -L 2>/dev/null | \
                   command sed -n -e "s/BROUTING//" -e "$chain")' \
                     -- "$cur"))
             fi

completions/iptables

@@ -7,31 +7,32 @@ _comp_cmd_iptables()
 
     local table="" chain='s/^Chain \([^ ]\{1,\}\).*$/\1/p'
 
+    local IFS=$' \t\n' # for ${table:+-t "$table"}
     [[ ${words[*]} =~ [[:space:]]-(t|-table=?)[[:space:]]*([^[:space:]]+) ]] &&
-        table="-t ${BASH_REMATCH[2]}"
+        table=${BASH_REMATCH[2]}
 
     case $prev in
         -*[AIDRPFXLZ])
-            COMPREPLY=($(compgen -W '`"$1" $table -nL 2>/dev/null | \
+            COMPREPLY=($(compgen -W '`"$1" ${table:+-t "$table"} -nL 2>/dev/null | \
                 command sed -ne "s/^Chain \([^ ]\{1,\}\).*$/\1/p"`' -- "$cur"))
             ;;
         -*t)
             COMPREPLY=($(compgen -W 'nat filter mangle' -- "$cur"))
             ;;
         -j)
-            if [[ $table == "-t filter" || ! $table ]]; then
+            if [[ $table == "filter" || ! $table ]]; then
                 COMPREPLY=($(compgen -W 'ACCEPT DROP LOG ULOG REJECT
-                `"$1" $table -nL 2>/dev/null | command sed -ne "$chain" \
+                `"$1" ${table:+-t "$table"} -nL 2>/dev/null | command sed -ne "$chain" \
                 -e "s/INPUT|OUTPUT|FORWARD|PREROUTING|POSTROUTING//"`' -- \
                     "$cur"))
-            elif [[ $table == "-t nat" ]]; then
+            elif [[ $table == "nat" ]]; then
                 COMPREPLY=($(compgen -W 'ACCEPT DROP LOG ULOG REJECT MIRROR SNAT
-                DNAT MASQUERADE `"$1" $table -nL 2>/dev/null | \
+                DNAT MASQUERADE `"$1" -t "$table" -nL 2>/dev/null | \
                 command sed -ne "$chain" -e "s/OUTPUT|PREROUTING|POSTROUTING//"`' \
                     -- "$cur"))
-            elif [[ $table == "-t mangle" ]]; then
+            elif [[ $table == "mangle" ]]; then
                 COMPREPLY=($(compgen -W 'ACCEPT DROP LOG ULOG REJECT MARK TOS
-                `"$1" $table -nL 2>/dev/null | command sed -ne "$chain" \
+                `"$1" -t "$table" -nL 2>/dev/null | command sed -ne "$chain" \
                 -e "s/INPUT|OUTPUT|FORWARD|PREROUTING|POSTROUTING//"`' -- \
                     "$cur"))
             fi