From: Lyn Fugmann <me@fugi.dev>
To: zsh-workers@zsh.org
Subject: [PATCH] remote files completion: remove double-escaping
Date: Wed, 10 Apr 2024 12:46:48 +0200 [thread overview]
Message-ID: <f000d5f5-05b0-47b7-af61-904ff9781f8e@fugi.dev> (raw)
Removes the double escaping in the remote files completion. This affects rsync and scp.
For example, instead of a space character in a remote filename turning into `\\\ `, it will now correctly turn into `\ `.
While scp apparently works with either one, rsync requires the latter since version 3.2.4[1] (unless the legacy behavior is explicitly enabled).
This has been a problem for almost two years now.
[1]: https://download.samba.org/pub/rsync/NEWS#3.2.4
diff --git a/Completion/Unix/Type/_remote_files b/Completion/Unix/Type/_remote_files
index 93e1b7f43..4d4a7abbf 100644
--- a/Completion/Unix/Type/_remote_files
+++ b/Completion/Unix/Type/_remote_files
@@ -60,10 +60,7 @@ if zstyle -T ":completion:${curcontext}:files" remote-access; then
dirprefix=${dir}/
fi
- if [[ -z $QIPREFIX ]]
- then rempat="${dirprefix}${PREFIX%%[^./][^/]#}\*"
- else rempat="${dirprefix}${(q)PREFIX%%[^./][^/]#}\*"
- fi
+ rempat="${dirprefix}${(q)PREFIX%%[^./][^/]#}\*"
# remote filenames
remfiles=(${(M)${(f)"$(
@@ -92,9 +89,9 @@ if zstyle -T ":completion:${curcontext}:files" remote-access; then
while _tags; do
while _next_label remote-files expl ${suf:-remote directory}; do
[[ -n $suf ]] &&
- compadd "$args[@]" "$expl[@]" -d remdispf -- ${(q)remdispf%[*=|]} && ret=0
+ compadd "$args[@]" "$expl[@]" -d remdispf -- ${remdispf%[*=|]} && ret=0
compadd ${suf:+-S/} $autoremove "$args[@]" "$expl[@]" -d remdispd \
- -- ${(q)remdispd%/} && ret=0
+ -- ${remdispd%/} && ret=0
done
(( ret )) || return 0
done
next reply other threads:[~2024-04-10 11:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-10 10:46 Lyn Fugmann [this message]
2024-04-10 18:45 ` Mikael Magnusson
2024-04-12 18:59 ` Bart Schaefer
2024-05-28 15:40 ` Lyn Fugmann
2024-07-08 21:17 ` Lawrence Velázquez
2024-07-14 16:37 ` Eric Cook
2024-07-14 23:22 ` Oliver Kiddle
2024-08-04 0:10 ` Eric Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f000d5f5-05b0-47b7-af61-904ff9781f8e@fugi.dev \
--to=me@fugi.dev \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).