zsh-workers
 help / color / mirror / code / Atom feed
* PATCH: option cache in netcat completion
@ 2018-03-24 13:45 Oliver Kiddle
  0 siblings, 0 replies; only message in thread
From: Oliver Kiddle @ 2018-03-24 13:45 UTC (permalink / raw)
  To: Zsh workers

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'


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2018-03-24 13:59 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-24 13:45 PATCH: option cache in netcat completion Oliver Kiddle

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).