fix(cvs,ssh): deprecate existing funcs favoring xfunc (fixup 192b60a)

Author: akinomyoga

completions/cvs

@@ -1,10 +1,5 @@
 # cvs(1) completion                                        -*- shell-script -*-
 
-_comp_xfunc_cvs_roots()
-{
-    _cvs_roots
-}
-
 _cvs_entries()
 {
     local prefix=${cur%/*}/ IFS=$'\n'
@@ -40,7 +35,7 @@ _cvs_kflags()
     COMPREPLY=($(compgen -W 'kv kvl k o b v' -- "$cur"))
 }
 
-_cvs_roots()
+_comp_xfunc_cvs_roots()
 {
     local -a cvsroots
     [[ -v CVSROOT ]] && cvsroots=("$CVSROOT")
@@ -50,6 +45,8 @@ _cvs_roots()
     __ltrim_colon_completions "$cur"
 }
 
+_comp_deprecate_func _cvs_roots _comp_xfunc_cvs_roots
+
 _cvs()
 {
     local cur prev words cword
@@ -278,7 +275,7 @@ _cvs()
             fi
             ;;
         cvsroot)
-            _cvs_roots
+            _comp_xfunc_cvs_roots
             ;;
         diff | log | status)
             if [[ $cur == -* ]]; then

completions/ssh

@@ -1,35 +1,5 @@
 # ssh(1) completion                                        -*- shell-script -*-
 
-_comp_xfunc_ssh_query()
-{
-    _ssh_query "$@"
-}
-
-_comp_xfunc_ssh_options()
-{
-    _ssh_options "$@"
-}
-
-_comp_xfunc_ssh_suboption_check()
-{
-    _ssh_suboption_check "$@"
-}
-
-_comp_xfunc_ssh_identityfile()
-{
-    _ssh_identityfile "$@"
-}
-
-_comp_xfunc_ssh_scp_remote_files()
-{
-    _scp_remote_files "$@"
-}
-
-_comp_xfunc_ssh_scp_local_files()
-{
-    _scp_local_files "$@"
-}
-
 _ssh_queries()
 {
     local queries=$(_comp_xfunc_ssh_query "$1" help)
@@ -40,11 +10,13 @@ _ssh_queries()
     COMPREPLY+=($(compgen -W "$queries help" -- "${cur,,}"))
 }
 
-_ssh_query()
+_comp_xfunc_ssh_query()
 {
     ${1:-ssh} -Q $2 2>/dev/null
 }
 
+_comp_deprecate_func _ssh_query _comp_xfunc_ssh_query
+
 _ssh_ciphers()
 {
     local ciphers=$(_comp_xfunc_ssh_query "$1" cipher)
@@ -62,7 +34,7 @@ _ssh_macs()
     COMPREPLY+=($(compgen -W "$macs" -- "$cur"))
 }
 
-_ssh_options()
+_comp_xfunc_ssh_options()
 {
     # curl --silent https://raw.githubusercontent.com/openssh/openssh-portable/master/ssh_config.5 | awk '$1==".It" && $2=="Cm" && $3!="Host" && $3!="Match" {print "        "$3}' | sort
     local opts=(
@@ -111,6 +83,8 @@ _ssh_options()
     $reset
 }
 
+_comp_deprecate_func _ssh_options _comp_xfunc_ssh_options
+
 # Complete a ssh suboption (like ForwardAgent=y<tab>)
 # Two parameters: the string to complete including the equal sign, and
 # the ssh executable to invoke (optional).
@@ -151,7 +125,7 @@ _ssh_suboption()
             COMPREPLY=($(compgen -W 'yes no always' -- "$cur"))
             ;;
         identityfile)
-            _ssh_identityfile
+            _comp_xfunc_ssh_identityfile
             ;;
         *file | identityagent | include | controlpath | revokedhostkeys | \
             xauthlocation)
@@ -240,7 +214,7 @@ _ssh_suboption()
 # Try to complete -o SubOptions=
 #
 # Returns 0 if the completion was handled or non-zero otherwise.
-_ssh_suboption_check()
+_comp_xfunc_ssh_suboption_check()
 {
     # Get prev and cur words without splitting on =
     local cureq=$(_get_cword :=) preveq=$(_get_pword :=)
@@ -251,6 +225,8 @@ _ssh_suboption_check()
     return 1
 }
 
+_comp_deprecate_func _ssh_suboption_check _comp_xfunc_ssh_suboption_check
+
 # Search COMP_WORDS for '-F configfile' or '-Fconfigfile' argument
 _ssh_configfile()
 {
@@ -271,7 +247,7 @@ _ssh_configfile()
 
 # With $1 set, look for public key files, else private
 # shellcheck disable=SC2120
-_ssh_identityfile()
+_comp_xfunc_ssh_identityfile()
 {
     [[ -z $cur && -d ~/.ssh ]] && cur=~/.ssh/id
     _filedir
@@ -281,6 +257,8 @@ _ssh_identityfile()
     fi
 }
 
+_comp_deprecate_func _ssh_identityfile _comp_xfunc_ssh_identityfile
+
 _ssh()
 {
     local cur prev words cword
@@ -289,7 +267,7 @@ _ssh()
     local configfile
     _ssh_configfile
 
-    _ssh_suboption_check "$1" && return
+    _comp_xfunc_ssh_suboption_check "$1" && return
 
     local ipvx
 
@@ -320,7 +298,7 @@ _ssh()
             return
             ;;
         -*i)
-            _ssh_identityfile
+            _comp_xfunc_ssh_identityfile
             return
             ;;
         -*J)
@@ -340,7 +318,7 @@ _ssh()
             return
             ;;
         -*o)
-            _ssh_options "$1"
+            _comp_xfunc_ssh_options "$1"
             return
             ;;
         -*Q)
@@ -392,7 +370,7 @@ _sftp()
     local configfile
     _ssh_configfile
 
-    _ssh_suboption_check && return
+    _comp_xfunc_ssh_suboption_check && return
 
     local ipvx
 
@@ -405,7 +383,7 @@ _sftp()
             return
             ;;
         -*i)
-            _ssh_identityfile
+            _comp_xfunc_ssh_identityfile
             return
             ;;
         -*c)
@@ -417,7 +395,7 @@ _sftp()
             return
             ;;
         -*o)
-            _ssh_options
+            _comp_xfunc_ssh_options
             return
             ;;
         -*S)
@@ -454,7 +432,7 @@ _scp_path_esc='[][(){}<>"'"'"',:;^&!$=?`\\|[:space:]]'
 # Complete remote files with ssh.  If the first arg is -d, complete on dirs
 # only.  Returns paths escaped with three backslashes.
 # shellcheck disable=SC2120
-_scp_remote_files()
+_comp_xfunc_ssh_scp_remote_files()
 {
     local IFS=$'\n'
 
@@ -492,11 +470,13 @@ _scp_remote_files()
     COMPREPLY+=($files)
 }
 
+_comp_deprecate_func _scp_remote_files _comp_xfunc_ssh_scp_remote_files
+
 # This approach is used instead of _filedir to get a space appended
 # after local file/dir completions, and -o nospace retained for others.
 # If first arg is -d, complete on directory names only.  The next arg is
 # an optional prefix to add to returned completions.
-_scp_local_files()
+_comp_xfunc_ssh_scp_local_files()
 {
     local IFS=$'\n'
 
@@ -517,6 +497,8 @@ _scp_local_files()
     fi
 }
 
+_comp_deprecate_func _scp_local_files _comp_xfunc_ssh_scp_local_files
+
 # scp(1) completion
 #
 _scp()
@@ -527,7 +509,7 @@ _scp()
     local configfile
     _ssh_configfile
 
-    _ssh_suboption_check && {
+    _comp_xfunc_ssh_suboption_check && {
         COMPREPLY=("${COMPREPLY[@]/%/ }")
         return
     }
@@ -546,7 +528,7 @@ _scp()
             return
             ;;
         -*i)
-            _ssh_identityfile
+            _comp_xfunc_ssh_identityfile
             compopt +o nospace
             return
             ;;
@@ -558,7 +540,7 @@ _scp()
             return
             ;;
         -*o)
-            _ssh_options
+            _comp_xfunc_ssh_options
             return
             ;;
         -*S)
@@ -579,7 +561,7 @@ _scp()
     case $cur in
         !(*:*)/* | [.~]*) ;; # looks like a path
         *:*)
-            _scp_remote_files
+            _comp_xfunc_ssh_scp_remote_files
             return
             ;;
     esac
@@ -607,7 +589,7 @@ _scp()
         esac
     fi
 
-    _scp_local_files "${prefix-}"
+    _comp_xfunc_ssh_scp_local_files "${prefix-}"
 } &&
     complete -F _scp -o nospace scp