From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-18607-mason-zsh=primenet.com.au@sunsite.dk>
Received: (qmail 3087 invoked from network); 5 Jun 2003 13:19:42 -0000
Received: from sunsite.dk (130.225.247.90)
  by ns1.primenet.com.au with SMTP; 5 Jun 2003 13:19:41 -0000
Received: (qmail 4676 invoked by alias); 5 Jun 2003 13:19:37 -0000
Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 18607
Received: (qmail 4669 invoked from network); 5 Jun 2003 13:19:36 -0000
Received: from localhost (HELO sunsite.dk) (127.0.0.1)
  by localhost with SMTP; 5 Jun 2003 13:19:36 -0000
X-MessageWall-Score: 0 (sunsite.dk)
Received: from [212.125.75.4] by sunsite.dk (MessageWall 1.0.8) with SMTP; 5 Jun 2003 13:19:36 -0000
Received: (qmail 20581 invoked from network); 5 Jun 2003 13:09:16 -0000
Received: from iris.logica.co.uk (158.234.9.163)
  by server-4.tower-1.messagelabs.com with SMTP; 5 Jun 2003 13:09:16 -0000
Received: from gmcs3.local ([158.234.142.61])
	by iris.logica.co.uk (8.12.3/8.12.3/Debian -4) with ESMTP id h55D9FQ1009453
	for <zsh-workers@sunsite.dk>; Thu, 5 Jun 2003 14:09:15 +0100
Received: from gmcs3.local (localhost [127.0.0.1])
	by gmcs3.local (8.11.6/8.11.6/SuSE Linux 0.5) with ESMTP id h55D9jk04006
	for <zsh-workers@sunsite.dk>; Thu, 5 Jun 2003 15:09:45 +0200
X-VirusChecked: Checked
From: Oliver Kiddle <okiddle@yahoo.co.uk>
To: Zsh workers <zsh-workers@sunsite.dk>
Subject: PATCH: rcp and quoting remote files
Date: Thu, 05 Jun 2003 15:09:45 +0200
Message-ID: <4004.1054818585@gmcs3.local>

The patches for scp completion in users/5915 and users/6080 are also
applicable to rcp. I thought I had checked this at the time.

Oliver

Index: Completion/Unix/Command/_rlogin
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_rlogin,v
retrieving revision 1.3
diff -u -r1.3 _rlogin
--- Completion/Unix/Command/_rlogin	7 May 2003 12:44:52 -0000	1.3
+++ Completion/Unix/Command/_rlogin	5 Jun 2003 13:02:47 -0000
@@ -5,7 +5,7 @@
   local expl remfiles remdispf remdispd suf ret=1
 
   if zstyle -T ":completion:${curcontext}:" remote-access; then
-    remfiles=(${(M)${(f)"$(rsh ${IPREFIX%:} 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 @@
     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