Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

PATCH: remove work of art in _umount



dpath_tmp could actually also have \040 in it, so also handle
that. (for example if you bindmount /tmp/foo\ bar to /tmp/foo\ foo,
both would). dev_tmp hopefully never will, but why not handle it anyway
(if it should even be completed at this point at all).

---

This doesn't in any way affect Silas' issue, but I spotted it while
looking at the completer.

---
 Completion/Unix/Command/_mount | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/Completion/Unix/Command/_mount b/Completion/Unix/Command/_mount
index 0428222..a3b58bb 100644
--- a/Completion/Unix/Command/_mount
+++ b/Completion/Unix/Command/_mount
@@ -959,27 +959,9 @@ udevordir)
   esac
 
   local MATCH MBEGIN MEND
-  # "Mummy, why is mount point matching full of squiggles?"
-  #
-  # "Well, dear, the clever people who wrote Linux decided that some
-  # funny characters that might confuse programmes looking at the names
-  # would be encoded as octal escapes, like for example \040 for space.
-  # The clever people who wrote zsh decided that nothing would
-  # ever be quite as simple as it should be, so to substitute octal
-  # escapes everywhere in a string, even though the shell understands
-  # them natively in print escapes, needs some hackery where you match
-  # the octal number using the numeric closure syntax introduced after
-  # 4.3.4, then reinput the number in a standard math mode format as 8#OOO,
-  # and turn that into a character using the (#) parameter flag."
-  #
-  # "Mummy, why is nothing ever quite as simple as it should be?"
-  #
-  # "Well, dear, if it was then the clever people who write programmes would
-  # have been replaced by intelligent monkeys and then they'd be out
-  # of working roaming the streets, and we wouldn't want that, would we?"
-  mp_tmp=("${(@q)mp_tmp//(#m)\\[0-7](#c3)/${(#)$(( 8#${MATCH[2,-1]} ))}}")
-  dpath_tmp=( "${(@Mq)dev_tmp:#/*}" )
-  dev_tmp=( "${(@q)dev_tmp:#/*}" )
+  mp_tmp=("${(@qg::)mp_tmp}")
+  dpath_tmp=( "${(@Mqg::)dev_tmp:#/*}" )
+  dev_tmp=( "${(@qg::)dev_tmp:#/*}" )
 
   _alternative \
     'device-labels:device label:compadd -a dev_tmp' \
-- 
2.2.0.GIT



Messages sorted by: Reverse Date, Date, Thread, Author