PATCH: add user control of hosts to complete

PATCH: add user control of hosts to complete

[Adam Spiers]

Hope this one's OK.

Index: Completion/User/_hosts
===================================================================
RCS file: /usr/local/cvsroot/zsh/Completion/User/_hosts,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 _hosts
--- Completion/User/_hosts	1999/09/16 11:39:44	1.1.1.3
+++ Completion/User/_hosts	1999/09/17 00:44:47
@@ -4,5 +4,8 @@
 
 : ${(A)hosts:=${(s: :)${(ps:\t:)${${(f)"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}}
 
+# Let the user add her own hosts in if she wants
+hosts=( $hostnames $hosts )
+
 _description expl host
 compadd -M 'm:{a-zA-Z}={A-Za-z} r:|.=* r:|=*' "$@" "$expl[@]" - "$hosts[@]"

Re: PATCH: add user control of hosts to complete

[Peter Stephenson]

Adam Spiers wrote:
>  : ${(A)hosts:=${(s: :)${(ps:\t:)${${(f)"$(</etc/hosts)"}%%\#*}##[:blank:]#[^
> [:blank:]]#}}}
>  
> +# Let the user add her own hosts in if she wants
> +hosts=( $hostnames $hosts )

As Sven already pointed out, $hosts is there for the user to set. It sets
its own defaults as a last gasp if it's empty.  If you do have your own
hosts, the contents of /etc/hosts may be simply noise. I don't think we
need a separate variable.

-- 
Peter Stephenson <pws@ibmth.df.unipi.it>       Tel: +39 050 844536
WWW:  http://www.ifh.de/~pws/
Dipartimento di Fisica, Via Buonarroti 2, 56127 Pisa, Italy

Re: PATCH: add user control of hosts to complete

[Adam Spiers]

Peter Stephenson (pws@ibmth.df.unipi.it) wrote:
> Adam Spiers wrote:
> >  : ${(A)hosts:=${(s: :)${(ps:\t:)${${(f)"$(</etc/hosts)"}%%\#*}##[:blank:]#[^
> > [:blank:]]#}}}
> >  
> > +# Let the user add her own hosts in if she wants
> > +hosts=( $hostnames $hosts )
> 
> As Sven already pointed out, $hosts is there for the user to set. It sets
> its own defaults as a last gasp if it's empty.  If you do have your own
> hosts, the contents of /etc/hosts may be simply noise. I don't think we
> need a separate variable.

Ack, sorry about that.  My brain tends to switch off when I look at
horrendously obfuscated rats-dropping-core lines.  OTOH, I do quite
like the idea of having the choice of merging /etc/hosts in with the
user-defined ones, but then I guess the user can just redefine _hosts
for that.

Re: PATCH: add user control of hosts to complete

[Sven Wischnowsky]

Adam Spiers wrote:

> Hope this one's OK.
> 
> ...
>  
>  : ${(A)hosts:=${(s: :)${(ps:\t:)${${(f)"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}}

Hm, this assignment already makes the value the user set `hosts' to
take precedence...

Bye
 Sven


--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de