From a390e36e9d9d5d4ec108ee195abca806688828e8 Mon Sep 17 00:00:00 2001 From: exploide Date: Wed, 8 Nov 2023 18:32:45 +0100 Subject: [PATCH] completions: improved netcat completions - fixed a copy and paste error from 7b8684e - enhanced ncat completions --- share/completions/nc.fish | 2 +- share/completions/ncat.fish | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/share/completions/nc.fish b/share/completions/nc.fish index 9ef9cc67a..0489c01d0 100644 --- a/share/completions/nc.fish +++ b/share/completions/nc.fish @@ -6,7 +6,7 @@ set -l flavor if string match -rq -- '^OpenBSD netcat' (nc -h 2>&1)[1] set flavor nc.openbsd else - set flavor (command -s netcat | path resolve | path basename) + set flavor (command -s nc | path resolve | path basename) end __fish_complete_netcat nc $flavor diff --git a/share/completions/ncat.fish b/share/completions/ncat.fish index 186b6bf1c..7a34087dd 100644 --- a/share/completions/ncat.fish +++ b/share/completions/ncat.fish @@ -8,6 +8,7 @@ complete -c ncat -s 6 -d "IPv6 only" complete -c ncat -s U -l unixsock -d "Use Unix domain sockets" complete -c ncat -s u -l udp -d "Use UDP" complete -c ncat -l sctp -d "Use SCTP" +complete -c ncat -l vsock -d "Use AF_VSOCK sockets" # CONNECT MODE OPTIONS complete -c ncat -s g -x -d "Loose source routing" @@ -35,12 +36,14 @@ function __fish_complete_openssl_ciphers end end complete -c ncat -l ssl-ciphers -x -a "(__fish_complete_list : __fish_complete_openssl_ciphers)" -d "Specify SSL ciphersuites" +complete -c ncat -l ssl-servername -x -a "(__fish_print_hostnames)" -d "Request distinct server name" complete -c ncat -l ssl-alpn -x -d "Specify ALPN protocol list" # PROXY OPTIONS complete -c ncat -l proxy -x -d "Specify proxy address" -complete -c ncat -l proxy-type -x -d "Specify proxy protocol" +complete -c ncat -l proxy-type -x -a "http socks4 socks5" -d "Specify proxy protocol" complete -c ncat -l proxy-auth -x -d "Specify proxy credentials" +complete -c ncat -l proxy-dns -x -a "local remote both none" -d "Specify where to resolve proxy destination" # COMMAND EXECUTION OPTIONS complete -c ncat -s e -l exec -r -d "Execute command" @@ -67,8 +70,10 @@ complete -c ncat -s v -l verbose -d "Be verbose" # MISC OPTIONS complete -c ncat -s C -l crlf -d "Use CRLF as EOL" complete -c ncat -s h -l help -d "Help screen" -complete -c ncat -l -recv-only -d "Only receive data" +complete -c ncat -l recv-only -d "Only receive data" complete -c ncat -l send-only -d "Only send data" complete -c ncat -l no-shutdown -d "Do not shutdown into half-duplex mode" +complete -c ncat -s n -l nodns -d "Do not resolve hostnames" complete -c ncat -s t -l telnet -d "Answer Telnet negotiations" complete -c ncat -l version -d "Display version" +complete -c ncat -s z -d "Report connection status only"