mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-19 23:41:31 +01:00
Code Releases Activity

merge changes from 4.1

Browse source
This commit is contained in:
Oliver Kiddle 2003-06-11 08:35:46 +00:00
parent 795cc66616
commit 4a4fa1af68
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,8 @@
2003-06-05 Oliver Kiddle <opk@zsh.org>
* 18607: Completion/Unix/Command/_rlogin: correctly handle
quoting for remote files for rcp completion
2003-06-05 Peter Stephenson <pws@csr.com>
* users/6154: Src/subst.c: anchors didn't work with //
@ -32,6 +37,15 @@
mention the inconsistency in README and alter the completion
system to hide the `/' a parameter so that it doesn't care.
2003-05-07 Oliver Kiddle <opk@zsh.org>
* users/6083: Completion/Unix/Command/_rlogin,
Completion/Unix/Command/_ssh: get hostname from IPREFIX instead
of words[CURRENT] to avoid quote characters
* Michał Politowski: users/6080: Completion/Unix/Command/_ssh:
remove one level of quoting on files before using with remote ls
2003-05-07 Peter Stephenson <pws@csr.com>
* 18508: Src/subst.c, Test/D04parameter.ztst: quoting of the `/'

6
Completion/Unix/Command/_rlogin
View file

@ -5,7 +5,7 @@ _rcp_remote_files () {
local expl remfiles remdispf remdispd suf ret=1
if zstyle -T ":completion:${curcontext}:" remote-access; then
remfiles=(${(M)${(f)"$(rsh ${words[CURRENT]%%:*} ls -d1F ${PREFIX%%[^./][^/]#}\* 2>/dev/null)"}%%[^/]#(|/)})
remfiles=(${(M)${(f)"$(rsh ${IPREFIX%:} ls -d1F ${(Q)PREFIX%%[^./][^/]#}\* 2>/dev/null)"}%%[^/]#(|/)})
compset -P '*/'
compset -S '/*' || suf='remote file'
@ -16,9 +16,9 @@ _rcp_remote_files () {
while _tags; do
while _next_label files expl ${suf:-remote directory}; do
[[ -n $suf ]] && compadd "$@" "$expl[@]" -d remdispf \
${remdispf%[*=@|]} && ret=0
${(q)remdispf%[*=@|]} && ret=0
compadd ${suf:+-S/} "$@" "$expl[@]" -d remdispd \
${remdispd%/} && ret=0
${(q)remdispd%/} && ret=0
done
(( ret )) || return 0
done

2
Completion/Unix/Command/_ssh
View file

@ -6,7 +6,7 @@ _remote_files () {
if zstyle -T ":completion:${curcontext}:" remote-access; then
zparseopts -D -E -a args p: 1 2 4 6 F:
remfiles=(${(M)${(f)"$(ssh $args -a -x ${words[CURRENT]%%:*} ls -d1F ${PREFIX%%[^./][^/]#}\* 2>/dev/null)"}%%[^/]#(|/)})
remfiles=(${(M)${(f)"$(ssh $args -a -x ${IPREFIX%:} ls -d1F ${(Q)PREFIX%%[^./][^/]#}\* 2>/dev/null)"}%%[^/]#(|/)})
compset -P '*/'
compset -S '/*' || suf='remote file'