Merging upstream version 1:2.12.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 170 insertions, 187 deletions

diff --git a/completions/hcitool b/completions/hcitool
index 58bf5a7..aacc108 100644
--- a/completions/hcitool
+++ b/completions/hcitool
@@ -1,178 +1,168 @@
 # bash completion for bluez utils                          -*- shell-script -*-
 
-_bluetooth_addresses()
+_comp_cmd_hcitool__bluetooth_addresses()
 {
-    if [[ -n ${COMP_BLUETOOTH_SCAN:-} ]]; then
-        COMPREPLY+=($(compgen -W "$(hcitool scan |
-            awk '/^\t/{print $1}')" -- "$cur"))
+    if [[ ${COMP_BLUETOOTH_SCAN-} ]]; then
+        _comp_compgen -a split -- "$(hcitool scan | _comp_awk '/^\t/{print $1}')"
     fi
 }
 
-_bluetooth_devices()
+_comp_cmd_hcitool__bluetooth_devices()
 {
-    COMPREPLY+=($(compgen -W "$(hcitool dev |
-        awk '/^\t/{print $1}')" -- "$cur"))
+    _comp_compgen -a split -- "$(hcitool dev | _comp_awk '/^\t/{print $1}')"
 }
 
-_bluetooth_services()
+_comp_cmd_hcitool__bluetooth_services()
 {
-    COMPREPLY=($(compgen -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
-        GN PANU HCRP HID CIP A2SRC A2SNK AVRCT AVRTG UDIUE UDITE SYNCML' \
-        -- "$cur"))
+    _comp_compgen -- -W 'DID SP DUN LAN FAX OPUSH FTP HS HF HFAG SAP NAP
+        GN PANU HCRP HID CIP A2SRC A2SNK AVRCT AVRTG UDIUE UDITE SYNCML'
 }
 
-_bluetooth_packet_types()
+_comp_cmd_hcitool__bluetooth_packet_types()
 {
-    COMPREPLY=($(compgen -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3' \
-        -- "$cur"))
+    _comp_compgen -- -W 'DM1 DM3 DM5 DH1 DH3 DH5 HV1 HV2 HV3'
 }
 
-_hcitool()
+_comp_cmd_hcitool()
 {
-    local cur prev words cword split
-    _init_completion -s || return
+    local cur prev words cword was_split comp_args
+    _comp_initialize -s -- "$@" || return
 
     case $prev in
         -i)
-            _bluetooth_devices
+            _comp_cmd_hcitool__bluetooth_devices
             return
             ;;
         --role)
-            COMPREPLY=($(compgen -W 'm s' -- "$cur"))
+            _comp_compgen -- -W 'm s'
             return
             ;;
         --pkt-type)
-            _bluetooth_packet_types
+            _comp_cmd_hcitool__bluetooth_packet_types
             return
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
-    local arg
-    _get_first_arg
-    if [[ -z $arg ]]; then
-        if [[ $cur == -* ]]; then
-            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
-        else
-            COMPREPLY=($(compgen -W 'dev inq scan name info spinq epinq cmd
-                con cc dc sr cpt rssi lq tpl afh lst auth enc key clkoff
-                clock' -- "$cur"))
-        fi
-    else
-        local args
-        case $arg in
+    local REPLY
+    if _comp_get_first_arg; then
+        case $REPLY in
             name | info | dc | rssi | lq | afh | auth | key | clkoff | lst)
-                _count_args
-                if ((args == 2)); then
-                    _bluetooth_addresses
+                _comp_count_args
+                if ((REPLY == 2)); then
+                    _comp_cmd_hcitool__bluetooth_addresses
                 fi
                 ;;
             cc)
                 if [[ $cur == -* ]]; then
-                    COMPREPLY=($(compgen -W '--role --pkt-type' -- "$cur"))
+                    _comp_compgen -- -W '--role --pkt-type'
                 else
-                    _count_args
-                    if ((args == 2)); then
-                        _bluetooth_addresses
+                    _comp_count_args
+                    if ((REPLY == 2)); then
+                        _comp_cmd_hcitool__bluetooth_addresses
                     fi
                 fi
                 ;;
             sr)
-                _count_args
-                if ((args == 2)); then
-                    _bluetooth_addresses
+                _comp_count_args
+                if ((REPLY == 2)); then
+                    _comp_cmd_hcitool__bluetooth_addresses
                 else
-                    COMPREPLY=($(compgen -W 'master slave' -- "$cur"))
+                    _comp_compgen -- -W 'master slave'
                 fi
                 ;;
             cpt)
-                _count_args
-                if ((args == 2)); then
-                    _bluetooth_addresses
+                _comp_count_args
+                if ((REPLY == 2)); then
+                    _comp_cmd_hcitool__bluetooth_addresses
                 else
-                    _bluetooth_packet_types
+                    _comp_cmd_hcitool__bluetooth_packet_types
                 fi
                 ;;
             tpl | enc | clock)
-                _count_args
-                if ((args == 2)); then
-                    _bluetooth_addresses
+                _comp_count_args
+                if ((REPLY == 2)); then
+                    _comp_cmd_hcitool__bluetooth_addresses
                 else
-                    COMPREPLY=($(compgen -W '0 1' -- "$cur"))
+                    _comp_compgen -- -W '0 1'
                 fi
                 ;;
         esac
+    else
+        if [[ $cur == -* ]]; then
+            _comp_compgen_help
+        else
+            _comp_compgen -- -W 'dev inq scan name info spinq epinq cmd con cc
+                dc sr cpt rssi lq tpl afh lst auth enc key clkoff clock'
+        fi
     fi
 } &&
-    complete -F _hcitool hcitool
+    complete -F _comp_cmd_hcitool hcitool
 
-_sdptool()
+_comp_cmd_sdptool()
 {
-    local cur prev words cword split
-    _init_completion -s || return
+    local cur prev words cword was_split comp_args
+    _comp_initialize -s -- "$@" || return
 
     case $prev in
         --bdaddr)
-            _bluetooth_addresses
+            _comp_cmd_hcitool__bluetooth_addresses
             return
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
-    local arg
-    _get_first_arg
-    if [[ -z $arg ]]; then
-        if [[ $cur == -* ]]; then
-            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
-        else
-            COMPREPLY=($(compgen -W 'search browse records add del get
-                setattr setseq' -- "$cur"))
-        fi
-    else
-        case $arg in
+    local REPLY
+    if _comp_get_first_arg; then
+        case $REPLY in
             search)
                 if [[ $cur == -* ]]; then
-                    COMPREPLY=($(compgen -W '--bdaddr --tree --raw --xml' \
-                        -- "$cur"))
+                    _comp_compgen -- -W '--bdaddr --tree --raw --xml'
                 else
-                    _bluetooth_services
+                    _comp_cmd_hcitool__bluetooth_services
                 fi
                 ;;
             browse | records)
                 if [[ $cur == -* ]]; then
-                    COMPREPLY=($(compgen -W '--tree --raw --xml' -- "$cur"))
+                    _comp_compgen -- -W '--tree --raw --xml'
                 else
-                    _bluetooth_addresses
+                    _comp_cmd_hcitool__bluetooth_addresses
                 fi
                 ;;
             add)
                 if [[ $cur == -* ]]; then
-                    COMPREPLY=($(compgen -W '--handle --channel' -- "$cur"))
+                    _comp_compgen -- -W '--handle --channel'
                 else
-                    _bluetooth_services
+                    _comp_cmd_hcitool__bluetooth_services
                 fi
                 ;;
             get)
                 if [[ $cur == -* ]]; then
-                    COMPREPLY=($(compgen -W '--bdaddr --tree --raw --xml' \
-                        -- "$cur"))
+                    _comp_compgen -- -W '--bdaddr --tree --raw --xml'
                 fi
                 ;;
         esac
+    else
+        if [[ $cur == -* ]]; then
+            _comp_compgen_help
+        else
+            _comp_compgen -- -W 'search browse records add del get setattr
+                setseq'
+        fi
     fi
 } &&
-    complete -F _sdptool sdptool
+    complete -F _comp_cmd_sdptool sdptool
 
-_l2ping()
+_comp_cmd_l2ping()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
     case $prev in
         -i)
-            _bluetooth_devices
+            _comp_cmd_hcitool__bluetooth_devices
             return
             ;;
         -s | -c | -t | -d)
@@ -181,200 +171,193 @@ _l2ping()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1")' -- "$cur"))
+        _comp_compgen_usage
     else
-        _bluetooth_addresses
+        _comp_cmd_hcitool__bluetooth_addresses
     fi
 } &&
-    complete -F _l2ping l2ping
+    complete -F _comp_cmd_l2ping l2ping
 
-_rfcomm()
+_comp_cmd_rfcomm()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
     case $prev in
         -f | --config)
-            _filedir
+            _comp_compgen_filedir
             return
             ;;
         -i)
-            _bluetooth_devices
-            _bluetooth_addresses
+            _comp_cmd_hcitool__bluetooth_devices
+            _comp_cmd_hcitool__bluetooth_addresses
             return
             ;;
     esac
 
-    local arg
-    _get_first_arg
-    if [[ -z $arg ]]; then
-        if [[ $cur == -* ]]; then
-            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
-        else
-            COMPREPLY=($(compgen -W 'show connect listen watch bind
-                release' -- "$cur"))
-        fi
-    else
-        local args
-        _count_args
+    local REPLY
+    if _comp_get_first_arg; then
+        local arg=$REPLY
+        _comp_count_args
+        local args=$REPLY
         if ((args == 2)); then
-            _bluetooth_devices
+            _comp_cmd_hcitool__bluetooth_devices
         else
             case $arg in
                 connect | bind)
                     if ((args == 3)); then
-                        _bluetooth_addresses
+                        _comp_cmd_hcitool__bluetooth_addresses
                     fi
                     ;;
             esac
         fi
+    else
+        if [[ $cur == -* ]]; then
+            _comp_compgen_help
+        else
+            _comp_compgen -- -W 'show connect listen watch bind release'
+        fi
     fi
 } &&
-    complete -F _rfcomm rfcomm
+    complete -F _comp_cmd_rfcomm rfcomm
 
-_ciptool()
+_comp_cmd_ciptool()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
     case $prev in
         -i)
-            _bluetooth_devices
-            _bluetooth_addresses
+            _comp_cmd_hcitool__bluetooth_devices
+            _comp_cmd_hcitool__bluetooth_addresses
             return
             ;;
     esac
 
-    local arg
-    _get_first_arg
-    if [[ -z $arg ]]; then
-        if [[ $cur == -* ]]; then
-            COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
-        else
-            COMPREPLY=($(compgen -W 'show search connect release loopback' \
-                -- "$cur"))
-        fi
-    else
-        local args
-        case $arg in
+    local REPLY
+    if _comp_get_first_arg; then
+        case $REPLY in
             connect | release | loopback)
-                _count_args
-                if ((args == 2)); then
-                    _bluetooth_addresses
+                local REPLY
+                _comp_count_args
+                if ((REPLY == 2)); then
+                    _comp_cmd_hcitool__bluetooth_addresses
                 fi
                 ;;
         esac
+    else
+        if [[ $cur == -* ]]; then
+            _comp_compgen_help
+        else
+            _comp_compgen -- -W 'show search connect release loopback'
+        fi
     fi
 } &&
-    complete -F _ciptool ciptool
+    complete -F _comp_cmd_ciptool ciptool
 
-_dfutool()
+_comp_cmd_dfutool()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
     case $prev in
         -d | --device)
-            _bluetooth_devices
+            _comp_cmd_hcitool__bluetooth_devices
             return
             ;;
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
     else
-        local args
-        _count_args
-        case $args in
+        local REPLY
+        _comp_count_args
+        case $REPLY in
             1)
-                COMPREPLY=($(compgen -W 'verify modify upgrade archive' \
-                    -- "$cur"))
+                _comp_compgen -- -W 'verify modify upgrade archive'
                 ;;
             2)
-                _filedir
+                _comp_compgen_filedir
                 ;;
         esac
     fi
 } &&
-    complete -F _dfutool dfutool
+    complete -F _comp_cmd_dfutool dfutool
 
-_hciconfig()
+_comp_cmd_hciconfig()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
-    local arg
-    _get_first_arg
-    if [[ -z $arg ]]; then
-        if [[ $cur == -* ]]; then
-            COMPREPLY=($(compgen -W '--help --all' -- "$cur"))
-        else
-            COMPREPLY=($(compgen -W 'up down reset rstat auth noauth encrypt
-                noencrypt secmgr nosecmgr piscan noscan iscan pscan ptype name
-                class voice iac inqmode inqdata inqtype inqparams pageparms
-                pageto afhmode aclmtu scomtu putkey delkey commands features
-                version revision lm' -- "$cur"))
-        fi
-    else
-        local args
-        case $arg in
+    local REPLY
+    if _comp_get_first_arg; then
+        case $REPLY in
             putkey | delkey)
-                _count_args
-                if ((args == 2)); then
-                    _bluetooth_addresses
+                _comp_count_args
+                if ((REPLY == 2)); then
+                    _comp_cmd_hcitool__bluetooth_addresses
                 fi
                 ;;
             lm)
-                _count_args
-                if ((args == 2)); then
-                    COMPREPLY=($(compgen -W 'MASTER SLAVE NONE ACCEPT' \
-                        -- "$cur"))
+                _comp_count_args
+                if ((REPLY == 2)); then
+                    _comp_compgen -- -W 'MASTER SLAVE NONE ACCEPT'
                 fi
                 ;;
             ptype)
-                _count_args
-                if ((args == 2)); then
-                    _bluetooth_packet_types
+                _comp_count_args
+                if ((REPLY == 2)); then
+                    _comp_cmd_hcitool__bluetooth_packet_types
                 fi
                 ;;
         esac
+    else
+        if [[ $cur == -* ]]; then
+            _comp_compgen -- -W '--help --all'
+        else
+            _comp_compgen -- -W 'up down reset rstat auth noauth encrypt
+                noencrypt secmgr nosecmgr piscan noscan iscan pscan ptype name
+                class voice iac inqmode inqdata inqtype inqparams pageparms
+                pageto afhmode aclmtu scomtu putkey delkey commands features
+                version revision lm'
+        fi
     fi
 } &&
-    complete -F _hciconfig hciconfig
+    complete -F _comp_cmd_hciconfig hciconfig
 
-_hciattach()
+_comp_cmd_hciattach()
 {
-    local cur prev words cword
-    _init_completion || return
+    local cur prev words cword comp_args
+    _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '-n -p -t -b -s -l' -- "$cur"))
+        _comp_compgen -- -W '-n -p -t -b -s -l'
     else
-        local args
-        _count_args
-        case $args in
+        local REPLY
+        _comp_count_args
+        case $REPLY in
             1)
-                COMPREPLY=($(printf '%s\n' /dev/tty*))
-                COMPREPLY=($(compgen -W '${COMPREPLY[@]}
-                    ${COMPREPLY[@]#/dev/}' -- "$cur"))
+                _comp_expand_glob COMPREPLY '/dev/tty*' &&
+                    _comp_compgen -- -W '"${COMPREPLY[@]}"
+                        "${COMPREPLY[@]#/dev/}"'
                 ;;
             2)
-                COMPREPLY=($(compgen -W 'any ericsson digi xircom csr bboxes
-                    swave bcsp 0x0105 0x080a 0x0160 0x0002' -- "$cur"))
+                _comp_compgen -- -W 'any ericsson digi xircom csr bboxes swave
+                    bcsp 0x0105 0x080a 0x0160 0x0002'
                 ;;
             3)
-                COMPREPLY=($(compgen -W '9600 19200 38400 57600 115200 230400
-                    460800 921600' -- "$cur"))
+                _comp_compgen -- -W '9600 19200 38400 57600 115200 230400
+                    460800 921600'
                 ;;
             4)
-                COMPREPLY=($(compgen -W 'flow noflow' -- "$cur"))
+                _comp_compgen -- -W 'flow noflow'
                 ;;
             5)
-                _bluetooth_addresses
+                _comp_cmd_hcitool__bluetooth_addresses
                 ;;
         esac
     fi
 } &&
-    complete -F _hciattach hciattach
+    complete -F _comp_cmd_hciattach hciattach
 
 # ex: filetype=sh