From f2621414ee5f2f601424c22f00e207903e3b6104 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 4 May 2024 03:03:18 +0200
Subject: Merging upstream version 1:2.12.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 completions/ping | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'completions/ping')

diff --git a/completions/ping b/completions/ping
index 446f026..44c0888 100644
--- a/completions/ping
+++ b/completions/ping
@@ -1,9 +1,9 @@
 # ping(8) completion                                       -*- shell-script -*-
 
-_ping()
+_comp_cmd_ping()
 {
-    local cur prev words cword
-    _init_completion -n = || return
+    local cur prev words cword comp_args
+    _comp_initialize -n = -- "$@" || return
 
     local ipvx
 
@@ -12,21 +12,21 @@ _ping()
             return
             ;;
         -*I)
-            _available_interfaces -a
+            _comp_compgen_available_interfaces -a
             return
             ;;
         -*M)
             # Path MTU strategy in Linux, mask|time in FreeBSD
             local opts="do want dont"
             [[ $OSTYPE == *bsd* ]] && opts="mask time"
-            COMPREPLY=($(compgen -W '$opts' -- "$cur"))
+            _comp_compgen -- -W '$opts'
             return
             ;;
         -*N)
             if [[ $cur != *= ]]; then
-                COMPREPLY=($(compgen -W 'name ipv6 ipv6-global ipv6-sitelocal
+                _comp_compgen -- -W 'name ipv6 ipv6-global ipv6-sitelocal
                     ipv6-linklocal ipv6-all ipv4 ipv4-all subject-ipv6=
-                    subject-ipv4= subject-name= subject-fqdn=' -- "$cur"))
+                    subject-ipv4= subject-name= subject-fqdn='
                 [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             fi
             return
@@ -34,19 +34,19 @@ _ping()
         -*Q)
             # TOS in Linux, "somewhat quiet" (no args) in FreeBSD
             if [[ $OSTYPE != *bsd* ]]; then
-                COMPREPLY=($(compgen -W '{0..7}' -- "$cur"))
+                _comp_compgen -- -W '{0..7}'
                 return
             fi
             ;;
         -*S)
             # Socket sndbuf in Linux, source IP in FreeBSD
-            [[ $OSTYPE == *bsd* ]] && _ip_addresses
+            [[ $OSTYPE == *bsd* ]] && _comp_compgen_ip_addresses
             return
             ;;
         -*T)
             # Timestamp option in Linux, TTL in FreeBSD
             [[ $OSTYPE == *bsd* ]] ||
-                COMPREPLY=($(compgen -W 'tsonly tsandaddr' -- "$cur"))
+                _comp_compgen -- -W 'tsonly tsandaddr'
             return
             ;;
         -*4*)
@@ -58,14 +58,14 @@ _ping()
     esac
 
     if [[ $cur == -* ]]; then
-        local opts=$(_parse_help "$1")
-        COMPREPLY=($(compgen -W '${opts:-$(_parse_usage "$1")}' -- "$cur"))
+        _comp_compgen_help || _comp_compgen_usage
         return
     fi
 
     [[ $1 == *6 ]] && ipvx=-6
-    _known_hosts_real ${ipvx-} -- "$cur"
+    [[ $1 == *4 ]] && ipvx=-4
+    _comp_compgen_known_hosts ${ipvx-} -- "$cur"
 } &&
-    complete -F _ping ping ping6
+    complete -F _comp_cmd_ping ping ping4 ping6
 
 # ex: filetype=sh
-- 
cgit v1.2.3