Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
PATCH: option cache in netcat completion
- X-seq: zsh-workers 42520
- From: Oliver Kiddle <okiddle@xxxxxxxxxxx>
- To: Zsh workers <zsh-workers@xxxxxxx>
- Subject: PATCH: option cache in netcat completion
- Date: Sat, 24 Mar 2018 14:45:33 +0100
- Authentication-results: amavisd4.gkg.net (amavisd-new); dkim=pass (2048-bit key) header.d=yahoo.co.uk
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.uk; s=s2048; t=1521899931; bh=VLThuAxkoUbFs+JcsringCUEndqrJWeLeC8ybTRkQpA=; h=From:To:Subject:Date:From:Subject; b=esRTKfMBlFap5o1qDZaT3vIOd+yBLbMJn0ek7TBQ+fglzZ2dI6bcwylIHZvRl2HZWuqMplWUgmdevYpb+bD5o5tsCQpHv7PQwtbL+/vcJ4jnkYoWcy1xTgo8EzKpQtGUfw/++SuJeSsLcMMKTMzlD5508wo+KUWlGu2NuihxUpagniJ035092RRXHiUr+LrWCcgB9FC7MAtCuKVJTeb5ftuz/uTG+mPIZXcSSdznIOc4vL8vShMeNIviDBvBsGkkcn2QLIMwwbjcapUVnZH7haMVsgJXBNMaSUT/VXCoFh7bJ5FwvzrJWlNBPppcRb6DMxLSL2f60mgGrnTnOmc9XQ==
- List-help: <mailto:zsh-workers-help@zsh.org>
- List-id: Zsh Workers List <zsh-workers.zsh.org>
- List-post: <mailto:zsh-workers@zsh.org>
- List-unsubscribe: <mailto:zsh-workers-unsubscribe@zsh.org>
- Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
This is a fairly minor tweak to netcat completion for something that
confused me.
If you have netcat installed as nc but not as netcat and try:
netcat -<tab>
It creates an empty array for the cache. Thereafter, option completion
won't work after nc either. This change uses $#array instead of $+array
but I've also renamed the variable with a _cache prefix to be more in
line with other functions that do caching.
The options could really do with filling out but it would have to be a
mess to handle GNU netcat, traditional netcat, each of the BSDs and
openbsd netcat installed on Linux. And socat is better anyway.
Oliver
diff --git a/Completion/Unix/Command/_netcat b/Completion/Unix/Command/_netcat
index 4e4006b30..250d4c85d 100644
--- a/Completion/Unix/Command/_netcat
+++ b/Completion/Unix/Command/_netcat
@@ -6,11 +6,12 @@ if [[ $service = nc ]] && ! _pick_variant netcat=connect nedit -h; then
return
fi
-if (( ! $+_nc_args )); then
+if (( ! $#_cache_nc_args )); then
+ typeset -ga _cache_nc_args
local help="$(_call_program options $words[1] -h < /dev/null 2>&1)"
local -A optionmap
optionmap=(
- '*-e prog*' '-e+[program to exec after connect]:prog:_command_names -e'
+ '*-e prog*' '-e+[program to exec after connect]:program:_command_names -e'
'*-g gateway*' '-g+[source-routing hop point]:gateway:_hosts'
'*-G num*' '-G[source-routing pointer: 4, 8, 12]'
'*-i secs*' '-i+[delay interval for lines sent or ports scanned]:delay (secs)'
@@ -28,10 +29,10 @@ if (( ! $+_nc_args )); then
'*-x*' '-x'
'*-b*' '-b[allow broadcasts]'
)
- _nc_args=($optionmap[(K)"$help"])
+ _cache_nc_args=( $optionmap[(K)"$help"] )
fi
_arguments -s \
- "$_nc_args[@]" \
+ "$_cache_nc_args[@]" \
':host:_hosts' \
':port:_ports'
Messages sorted by:
Reverse Date,
Date,
Thread,
Author