mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-27 13:23:09 +00:00
Speed up __fish_print_hostnames for faster completions
Thanks to @ThomasAH, as per #4378. Tested on many platforms (OS X,
FreeBSD, Linux, and Solaris). Works with IPv4 and IPv6 as well as
host names and loopback addresses.
(cherry picked from commit 3b3bcc998e
)
This commit is contained in:
parent
73282c9c4d
commit
67e3bac583
1 changed files with 17 additions and 9 deletions
|
@ -94,16 +94,24 @@ function __fish_print_hostnames -d "Print a list of known hostnames"
|
|||
set known_hosts $known_hosts (string replace -rfi '.*KnownHostsFile\s*' '' <$file)
|
||||
end
|
||||
end
|
||||
for file in $known_hosts
|
||||
for file in $known_hosts
|
||||
if test -r $file
|
||||
# Ignore hosts that are hashed, commented or @-marked and strip the key.
|
||||
string replace -r '[#@| ].*' '' <$file \
|
||||
# Split on ",".
|
||||
# Ignore negated/wildcarded hosts.
|
||||
| string split "," | string match -rv '[!\*\?]' \
|
||||
# Extract hosts with custom port.
|
||||
| string replace -r '\[([^]]+)\]:.*' '$1'
|
||||
# string replace -ra '(\S+) .*' '$1' <$file | string match -r '^[^#|[=]+$' | string split ","
|
||||
# Ignore hosts that are hashed, commented or @-marked and strip the key.
|
||||
awk '$1 !~ /[|#@]/ {
|
||||
n=split($1, entries, ",")
|
||||
for (i=1; i<=n; i++) {
|
||||
# Ignore negated/wildcarded hosts.
|
||||
if (!match(entry=entries[i], "[!*?]")) {
|
||||
# Extract hosts with custom port.
|
||||
if (substr(entry, 1, 1) == "[") {
|
||||
if (pos=match(entry, "]:.*$")) {
|
||||
entry=substr(entry, 2, pos-2)
|
||||
}
|
||||
}
|
||||
print entry
|
||||
}
|
||||
}
|
||||
}' $file
|
||||
end
|
||||
end
|
||||
return 0
|
||||
|
|
Loading…
Reference in a new issue