From 9d071829ecbcb34128c34d4b2855342f81f1dd48 Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Wed, 7 May 2003 12:44:46 +0000 Subject: users/6080, users/6083: more quoting fixes --- ChangeLog | 9 +++++++++ Completion/Unix/Command/_rlogin | 2 +- Completion/Unix/Command/_ssh | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e3fe86a4..a942e5407 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-05-07 Oliver Kiddle + + * 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 * 18508: Src/subst.c, Test/D04parameter.ztst: quoting of the `/' diff --git a/Completion/Unix/Command/_rlogin b/Completion/Unix/Command/_rlogin index 32f49e19a..4fb010ec6 100644 --- a/Completion/Unix/Command/_rlogin +++ b/Completion/Unix/Command/_rlogin @@ -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 ${PREFIX%%[^./][^/]#}\* 2>/dev/null)"}%%[^/]#(|/)}) compset -P '*/' compset -S '/*' || suf='remote file' diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh index 4ea17dd87..8716c676c 100644 --- a/Completion/Unix/Command/_ssh +++ b/Completion/Unix/Command/_ssh @@ -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' -- cgit 1.4.1