diff options
| author | Oliver Kiddle <opk@users.sourceforge.net> | 2004-08-07 14:28:31 +0000 |
|---|---|---|
| committer | Oliver Kiddle <opk@users.sourceforge.net> | 2004-08-07 14:28:31 +0000 |
| commit | 0172512966f4cc518b58dac5743c31e881927f38 (patch) | |
| tree | 04e518e3db7a616164a95a37bd3ece13440a8090 | |
| parent | fd62429d19b652877cdce97f0508c2c3924049f5 (diff) | |
| download | zsh-0172512966f4cc518b58dac5743c31e881927f38.tar.gz zsh-0172512966f4cc518b58dac5743c31e881927f38.tar.xz zsh-0172512966f4cc518b58dac5743c31e881927f38.zip | |
20235: sync remote file completion against _ssh to fix bug with quote handling
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_rsync | 45 |
2 files changed, 25 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog index 6ff964fc3..c0b8be10d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-08-07 Oliver Kiddle <opk@zsh.org> + + * 20235: Completion/Unix/Command/_rsync: synched remote file + completion with that in _ssh. quoting needed quoting. + 2004-08-07 Geoff Wing <gcw@zsh.org> * 20196: Src/prompt.c: still allow user specified text modifiers diff --git a/Completion/Unix/Command/_rsync b/Completion/Unix/Command/_rsync index 533c30e9d..5420b7a24 100644 --- a/Completion/Unix/Command/_rsync +++ b/Completion/Unix/Command/_rsync @@ -1,12 +1,9 @@ #compdef rsync _rsync_remote_files() { -local suf tag=accounts +local expl remfiles remdispf remdispd remmodules suf ret=1 tag=accounts -if [[ -prefix *::*/ ]]; then - local remfiles remdispf remdispd - - compset -P '*::*/' +if compset -P '*::*/'; then remfiles=(${(f)"$(_call_program files rsync ${words[CURRENT]%/*}/)"}) @@ -19,10 +16,7 @@ if [[ -prefix *::*/ ]]; then _wanted files expl 'remote file or directory' \ compadd -S/ -d remdispd ${remdispd##* } -elif [[ -prefix 1 *:: ]]; then - local remfiles remmodules - - compset -P 1 '*::' +elif compset -P 1 '*::'; then remfiles=(${(f)"$(_call_program files rsync ${words[CURRENT]%::*}::)"}) @@ -30,32 +24,33 @@ elif [[ -prefix 1 *:: ]]; then _describe "remote modules" remmodules -S/ -elif [[ -prefix 1 *: ]]; then - local remfiles remdispf remdispd slash +elif compset -P 1 '*:'; then - compset -P 1 '*:' - - if zstyle -T ":completion:${curcontext}:" remote-access; then - slash=/ - remfiles=(${(f)"$(_call_program files ssh -a -x ${words[CURRENT]%:*} ls -d1FL "${${${words[CURRENT -]#*:}:h}/${slash}(#e)/}/\* 2>/dev/null")"}) + if zstyle -T ":completion:${curcontext}:files" remote-access; then + remfiles=(${(M)${(f)"$(_call_program files ssh -a -x ${IPREFIX%:} ls -d1FL "${(Q)PREFIX%%[^./][^/]#}\*" 2>/dev/null)"}%%[^/]#(|/)}) + compset -P '*/' + compset -S '/*' || suf='remote file' remdispf=(${remfiles:#*/}) remdispd=(${(M)remfiles:#*/}) - _wanted files expl 'remote file or directory' \ - compadd -d remdispf ${${remfiles:#*/}/[*=@|](#e)/} - - _wanted files expl 'remote file or directory' \ - compadd -S/ -d remdispd ${${(M)remfiles:#*/}/${slash}(#e)/} + _tags files + while _tags; do + while _next_label files expl ${suf:-remote directory}; do + [[ -n $suf ]] && compadd "$@" "$expl[@]" -d remdispf \ + ${(q)remdispf%[*=@|]} && ret=0 + compadd ${suf:+-S/} "$@" "$expl[@]" -d remdispd \ + ${(q)remdispd%/} && ret=0 + done + (( ret )) || return 0 + done else - _message -e remote-files 'remote files' + _message -e remote-files 'remote file' fi -elif [[ -prefix 1 *@ ]]; then +elif compset -P 1 '*@'; then local user=${PREFIX%%@*} - compset -P 1 '*@' compset -S ':*' || suf=":" _wanted -C user-at hosts expl "host for $user" \ |