about summary refs log tree commit diff
diff options
context:
space:
mode:
authorStephane Chazelas <stephane@chazelas.org>2023-06-08 15:25:13 +0900
committerJun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>2023-06-08 15:26:41 +0900
commit2778fc5d7a1bf974147ee7e9b116adac97e20eea (patch)
treee417b4d0287d18e98ecf430f0ce25b8d1a9b54c3
parent58852b3246e41be1512d5d167bb47b69c099c324 (diff)
downloadzsh-2778fc5d7a1bf974147ee7e9b116adac97e20eea.tar.gz
zsh-2778fc5d7a1bf974147ee7e9b116adac97e20eea.tar.xz
zsh-2778fc5d7a1bf974147ee7e9b116adac97e20eea.zip
51817: protect ':' in _rcctl
This was in 51817 but missed in commit 0577daf.
Also remove _ant.rej that was added by the commit.
-rw-r--r--ChangeLog5
-rw-r--r--Completion/BSD/Command/_rcctl2
-rw-r--r--Completion/Unix/Command/_ant.rej13
3 files changed, 6 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index e1cd64c91..16ce32b54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-06-08  Jun-ichi Takimoto  <takimoto-j@kba.biglobe.ne.jp>
+
+	* Stephane: 51817: Completion/BSD/Command/_rcctl: protect ':'
+	in _rcctl (was in 51817 but missed in commit 0577daf)
+
 2023-06-06  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* Stephan: 51818: Protect another ':'.
diff --git a/Completion/BSD/Command/_rcctl b/Completion/BSD/Command/_rcctl
index 98e4f9846..457c3eb85 100644
--- a/Completion/BSD/Command/_rcctl
+++ b/Completion/BSD/Command/_rcctl
@@ -46,6 +46,6 @@ case $service in
       '*:argument:'
     ;;
   ${(~j:|:)actions}|disable|enable)
-    _arguments "*:service to $words[2]:_services"
+    _arguments "*:service to ${words[2]}:_services"
     ;;
 esac
diff --git a/Completion/Unix/Command/_ant.rej b/Completion/Unix/Command/_ant.rej
deleted file mode 100644
index 15e26c9da..000000000
--- a/Completion/Unix/Command/_ant.rej
+++ /dev/null
@@ -1,13 +0,0 @@
---- Completion/Unix/Command/_ant
-+++ Completion/Unix/Command/_ant
-@@ -79,8 +79,8 @@ case $state in
-     compset -P '*:'
-     compset -S ':*'
-     _alternative \
--      "classpath:$state:_path_files -qS: -g '*.(jar|zip)(-.)'" \
--      "classpath:$state:_path_files -r': ' -/" && ret=0
-+      "classpath:${state}:_path_files -qS: -g '*.(jar|zip)(-.)'" \
-+      "classpath:${state}:_path_files -r': ' -/" && ret=0
-   ;;
-   property)
-     if compset -P 1 '*='; then