From 99c12c43d8d27fe07aa4883b937977a4afea3565 Mon Sep 17 00:00:00 2001
From: Andreas Ferber <af+git@chaos-agency.de>
Date: Tue, 24 Sep 2013 21:44:54 +0200
Subject: [PATCH] Improve SSH known_hosts parsing.

---
 lib/completion.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index e0cdcf626..f017e54c5 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -32,8 +32,8 @@ zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-dir
 cdpath=(.)
 
 # use /etc/hosts and known_hosts for hostname completion
-[ -r /etc/ssh/ssh_known_hosts ] && _global_ssh_hosts=(${${${${(f)"$(</etc/ssh/ssh_known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _global_ssh_hosts=()
-[ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
+[ -r /etc/ssh/ssh_known_hosts ] && _global_ssh_hosts=(${${(ps:,:)${(pj:,:)${${${(f)"$(</etc/ssh/ssh_known_hosts)"}%%\#*}%%\ *}}}:#[0-9]*}) || _global_ssh_hosts=()
+[ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${(ps:,:)${(pj:,:)${${${(f)"$(<$HOME/.ssh/known_hosts)"}%%\#*}%%\ *}}}:#[0-9]*}) || _ssh_hosts=()
 [ -r ~/.ssh/config ] && _ssh_config=($(cat ~/.ssh/config | sed -ne 's/Host[=\t ]//p')) || _ssh_config=()
 [ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
 hosts=(