]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
shell-completion: zsh: fix incorrect unescaping
authorbryango <bryango@users.noreply.github.com>
Thu, 15 Aug 2024 05:18:17 +0000 (13:18 +0800)
committerLuca Boccassi <luca.boccassi@gmail.com>
Thu, 15 Aug 2024 18:28:12 +0000 (20:28 +0200)
Previously the `_filter_units_by_property` completion function
outputs with a [zsh parameter expansion flag] `g:o:`. This means
that the returned result is unescaped as the zsh builtin `echo`,
except that octal escapes don’t take a leading zero. This seemed to
have worked back in the days when it was first introduced:

  6c9414a700a040be1d3160bd2336baac58a1da3e

But it now leads to incorrect over-unescaping; for example,

  system-systemd\\x2djournald.slice (correct)

is incorrectly completed by zsh in commands such as
`systemctl kill`:

  system-systemd-journald.slice (incorrect)

This commit fixes such problems by removing the `g:o:` flag.

See:
[zsh parameter expansion flag]: https://zsh.sourceforge.io/Doc/Release/Expansion.html#Parameter-Expansion-Flags

shell-completion/zsh/_systemctl.in

index df9045f229bca71f9120a89df5ed7a2cfe6a7910..a5a16b3fdbe1700d341596728bd067839761c419 100644 (file)
@@ -190,7 +190,7 @@ __systemctl()
         local -a units; units=("${(q-)@}")
         local -A props
         props=(${(f)"$(_call_program units "$service $_sys_service_mgr show --no-pager --property=\"Id,$property\" -- ${units} 2>/dev/null")"})
-        echo -E - "${(@g:o:)${(k@)props[(Re)$property=$value]}#Id=}"
+        echo -E - "${(@)${(k@)props[(Re)$property=$value]}#Id=}"
     }
 
 (( $+functions[_systemctl_get_non_template_names] )) ||