summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Sequeira <qmega@sksm.net>2024-09-16 04:13:38 -0400
committerOliver Kiddle <opk@zsh.org>2024-09-18 11:08:08 +0200
commit91c56ed27a7e191a257778af831e3d491cdb995c (patch)
tree4886dfcc6beae3a58e5654ae153c9caf95f929f6
parent62131ae0499da56ecad237e5f82007a73cfff4fd (diff)
downloadzsh-91c56ed27a7e191a257778af831e3d491cdb995c.tar.gz
zsh-91c56ed27a7e191a257778af831e3d491cdb995c.zip
53095: fix completion for chmod/chown --reference with escaped filename
-rw-r--r--ChangeLog4
-rw-r--r--Completion/Unix/Command/_chmod4
-rw-r--r--Completion/Unix/Command/_chown6
3 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f1f23bd31..d397fc249 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2024-09-18 Oliver Kiddle <opk@zsh.org>
+ * Philip Sequeira: 53095: Completion/Unix/Command/_chmod,
+ Completion/Unix/Command/_chown: fix completion for chmod/chown
+ --reference with escaped filename
+
* 53094: configure.ac, Src/signals.h: remove unused autoconf tests
* 53093: Src/input.c: silence compiler warning when USE_LSEEK
diff --git a/Completion/Unix/Command/_chmod b/Completion/Unix/Command/_chmod
index 42e3fa63b..693f348dc 100644
--- a/Completion/Unix/Command/_chmod
+++ b/Completion/Unix/Command/_chmod
@@ -67,13 +67,13 @@ case "$variant" in
;;
esac
-_arguments -C -s -S $aopts "$args[@]" && ret=0
+_arguments -C -s -S -0 $aopts "$args[@]" && ret=0
case "$state" in
files)
if [[ -n $opt_args[--reference] ]]; then
zmodload -F zsh/stat b:zstat 2>/dev/null
- typeset -i8 ref=$(zstat +mode $opt_args[--reference])
+ typeset -i8 ref=$(zstat +mode $opt_args[--reference]:Q)
_wanted files expl file _files -g "*(-.^f${ref#??})" && ret=0
elif [[ $line[1] = [0-7]## ]]; then
_wanted files expl file _files -g "*(-.^f$line[1])" && ret=0
diff --git a/Completion/Unix/Command/_chown b/Completion/Unix/Command/_chown
index 4362d6e75..bcc6aec2f 100644
--- a/Completion/Unix/Command/_chown
+++ b/Completion/Unix/Command/_chown
@@ -71,7 +71,7 @@ case "$variant" in
esac
(( $+words[(r)--reference*] )) || args+=( '(--reference)1: :->owner' )
-_arguments -C -s -S $aopts "$args[@]" '*: :->files' && ret=0
+_arguments -C -s -S -0 $aopts "$args[@]" '*: :->files' && ret=0
case $state in
owner)
@@ -95,8 +95,8 @@ case $state in
(( $+opt_args[-h] || $+opt_args[--no-dereference] )) || deref="-"
if (( $+opt_args[--reference] )); then
zmodload -F zsh/stat b:zstat 2>/dev/null
- usr=$(zstat +uid $opt_args[--reference])
- grp=$(zstat +gid $opt_args[--reference])
+ usr=$(zstat +uid $opt_args[--reference]:Q)
+ grp=$(zstat +gid $opt_args[--reference]:Q)
_wanted files expl file _files -g "*($deref^u$usr,$deref^g$grp)" && ret=0
return ret
fi