From: Mikael Magnusson <mikachu@gmail.com>
To: zsh-workers@zsh.org
Subject: PATCH: Handle completer filenames with funny characters in them
Date: Mon, 18 Mar 2024 16:17:51 +0100 [thread overview]
Message-ID: <20240318151751.1096-1-mikachu@gmail.com> (raw)
For example, a file called _foo;bar will cause this to happen:
% hello [press tab]zsh: command not found: _foo
zsh: command not found: bar
I'll admit I'm not sure if adding the -r for compassocs at the end is
correct, the array is empty for me and I don't know what it's for.
---
Completion/compdump | 6 +++---
Completion/compinit | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Completion/compdump b/Completion/compdump
index 6daf92f9ff..5af5174f12 100644
--- a/Completion/compdump
+++ b/Completion/compdump
@@ -113,7 +113,7 @@ integer _i=5
print -n autoload -Uz >& $_d_fd
while (( $#_d_als )); do
if (( ! $+_compautos[$_d_als[1]] )); then
- print -n " $_d_als[1]"
+ print -rn " ${(q-)_d_als[1]}"
if (( ! --_i && $#_d_als > 1 )); then
_i=5
print -n ' \\\n '
@@ -126,13 +126,13 @@ print >& $_d_fd
local _c
for _c in "${(ok@)_compautos}"; do
- print "autoload -Uz $_compautos[$_c] $_c" >& $_d_fd
+ print -r "autoload -Uz ${(q-)_compautos[$_c]} $_c" >& $_d_fd
done
print >& $_d_fd
print "typeset -gUa _comp_assocs" >& $_d_fd
-print "_comp_assocs=( ${(qq)_comp_assocs} )" >& $_d_fd
+print -r "_comp_assocs=( ${(qq)_comp_assocs} )" >& $_d_fd
exec {_d_fd}>&-
mv -f $_d_file ${_d_file%.$HOST.$$}
diff --git a/Completion/compinit b/Completion/compinit
index 5cb527fac8..51e9d88b83 100644
--- a/Completion/compinit
+++ b/Completion/compinit
@@ -301,7 +301,7 @@ compdef() {
if [[ -z "$eval" ]] && [[ "$1" = *\=* ]]; then
while (( $# )); do
if [[ "$1" = *\=* ]]; then
- cmd="${1%%\=*}"
+ cmd="${(q)${1%%\=*}}"
svc="${1#*\=}"
func="$_comps[${_services[(r)$svc]:-$svc}]"
[[ -n ${_services[$svc]} ]] &&
@@ -412,7 +412,7 @@ compdef() {
svc=
fi
if [[ -z "$new" || -z "${_comps[$1]}" ]]; then
- _comps[$cmd]="$func"
+ _comps[$cmd]="${(q)func}"
[[ -n "$svc" ]] && _services[$cmd]="${1#*\=}"
fi
;;
--
2.38.1
reply other threads:[~2024-03-18 15:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20240318151751.1096-1-mikachu@gmail.com \
--to=mikachu@gmail.com \
--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).