* [PATCH] _df: Complete mounted device and mount points.
@ 2017-08-02 15:10 Daniel Shahaf
0 siblings, 0 replies; only message in thread
From: Daniel Shahaf @ 2017-08-02 15:10 UTC (permalink / raw)
To: zsh-workers
This splits umount's "udevordir" completion from _mount to a new file,
without changing it.
---
I tested this on linux, but both _df and _umountable have different codepaths
for each of linux / BSD / other, so some testing on those would be appreciated.
Cheers,
Daniel
Completion/Unix/Command/_df | 6 +++---
Completion/Unix/Command/_mount | 43 +--------------------------------------
Completion/Unix/Type/_umountable | 44 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 48 insertions(+), 45 deletions(-)
create mode 100644 Completion/Unix/Type/_umountable
diff --git a/Completion/Unix/Command/_df b/Completion/Unix/Command/_df
index 677b8c727..d20ddea7e 100644
--- a/Completion/Unix/Command/_df
+++ b/Completion/Unix/Command/_df
@@ -16,7 +16,7 @@ if _pick_variant gnu=GNU unix --version; then
'-v[(ignored)]'
'(- : *)--help[display help and exit]'
'(- : *)--version[output version information and exit]'
- '*:files:_files'
+ '*:files:_umountable'
- '(format)'
{-B+,--block-size=}'[specify block size]:size (bytes)'
'-k[like --block-size=1K]'
@@ -39,7 +39,7 @@ elif [[ "$OSTYPE" == (darwin|freebsd|dragonfly)* ]]; then
'-i[include inode usage statistics (default)]'
'-l[only display locally-mounted file systems]'
'-n[use previously obtained statistics]'
- '*:files:_files'
+ '*:files:_umountable'
)
spec='[only display file systems of specified types]:file system type:->fslist'
case "$OSTYPE" in
@@ -59,7 +59,7 @@ else
'-k[use 1024-byte blocks]'
'-P[POSIX compliant output]'
'-t[include total allocated-space figures in the output]'
- '*:files:_files'
+ '*:files:_umountable'
)
fi
diff --git a/Completion/Unix/Command/_mount b/Completion/Unix/Command/_mount
index 9a7041dee..03cc01f8d 100644
--- a/Completion/Unix/Command/_mount
+++ b/Completion/Unix/Command/_mount
@@ -931,48 +931,7 @@ devordir)
esac
;;
udevordir)
- local dev_tmp dpath_tmp mp_tmp mline
-
- case "$OSTYPE" in
- linux*|irix*)
- tmp=( "${(@f)$(< /etc/mtab)}" )
- dev_tmp=( "${(@)${(@)tmp%% *}:#none}" )
- mp_tmp=( "${(@)${(@)tmp#* }%% *}" )
- ;;
- freebsd*|dragonfly*)
- /sbin/mount | while read mline; do
- dev_tmp+=( $mline[(w)1] )
- mp_tmp+=( $mline[(w)3] )
- done
- ;;
- darwin*)
- tmp=( "${(@f)$(/sbin/mount)}" )
- dev_tmp=( "${(@)${(@)tmp%% *}:#map}" )
- mp_tmp=( "${(@)${(@)tmp#* on }%% \(*}" )
- ;;
- *)
- /sbin/mount | while read mline; do
- mp_tmp+=( $mline[(w)1] )
- dev_tmp+=( $mline[(w)3] )
- done
- ;;
- esac
-
- local MATCH MBEGIN MEND
- # The complicated substitution for mount point names is required because
- # characters in /etc/mtab that might confuse programs reading the names
- # are encoded as exactly 3 octal digits, like for example \040 for space.
- # The cleaner-looking ${(g::)mp_tmp} might consume too many digits.
- # Both mp_tmp and dev_tmp are derived from /etc/mtab or "mount" output.
- mp_tmp=("${(@)mp_tmp//(#m)\\[0-7](#c3)/${(#)$(( 8#${MATCH[2,-1]} ))}}")
- dev_tmp=("${(@)dev_tmp//(#m)\\[0-7](#c3)/${(#)$(( 8#${MATCH[2,-1]} ))}}")
- dpath_tmp=( "${(@M)dev_tmp:#/*}" )
- dev_tmp=( "${(@)dev_tmp:#/*}" )
-
- _alternative \
- 'device-labels:device label:compadd -a dev_tmp' \
- 'device-paths: device path:_canonical_paths -A dpath_tmp -N -M "r:|/=* r:|=*" device-paths device\ path' \
- 'directories:mount point:_canonical_paths -A mp_tmp -N -M "r:|/=* r:|=*" directories mount\ point' && ret=0
+ _umountable
;;
labels)
_wanted labels expl 'disk label' compadd /dev/disk/by-label/*(:t) && ret=0
diff --git a/Completion/Unix/Type/_umountable b/Completion/Unix/Type/_umountable
new file mode 100644
index 000000000..2b2567478
--- /dev/null
+++ b/Completion/Unix/Type/_umountable
@@ -0,0 +1,44 @@
+#autoload
+local tmp
+local dev_tmp dpath_tmp mp_tmp mline
+
+case "$OSTYPE" in
+linux*|irix*)
+ tmp=( "${(@f)$(< /etc/mtab)}" )
+ dev_tmp=( "${(@)${(@)tmp%% *}:#none}" )
+ mp_tmp=( "${(@)${(@)tmp#* }%% *}" )
+ ;;
+freebsd*|dragonfly*)
+ /sbin/mount | while read mline; do
+ dev_tmp+=( $mline[(w)1] )
+ mp_tmp+=( $mline[(w)3] )
+ done
+;;
+darwin*)
+ tmp=( "${(@f)$(/sbin/mount)}" )
+ dev_tmp=( "${(@)${(@)tmp%% *}:#map}" )
+ mp_tmp=( "${(@)${(@)tmp#* on }%% \(*}" )
+ ;;
+*)
+ /sbin/mount | while read mline; do
+ mp_tmp+=( $mline[(w)1] )
+ dev_tmp+=( $mline[(w)3] )
+ done
+ ;;
+esac
+
+local MATCH MBEGIN MEND
+# The complicated substitution for mount point names is required because
+# characters in /etc/mtab that might confuse programs reading the names
+# are encoded as exactly 3 octal digits, like for example \040 for space.
+# The cleaner-looking ${(g::)mp_tmp} might consume too many digits.
+# Both mp_tmp and dev_tmp are derived from /etc/mtab or "mount" output.
+mp_tmp=("${(@)mp_tmp//(#m)\\[0-7](#c3)/${(#)$(( 8#${MATCH[2,-1]} ))}}")
+dev_tmp=("${(@)dev_tmp//(#m)\\[0-7](#c3)/${(#)$(( 8#${MATCH[2,-1]} ))}}")
+dpath_tmp=( "${(@M)dev_tmp:#/*}" )
+dev_tmp=( "${(@)dev_tmp:#/*}" )
+
+_alternative \
+ 'device-labels:device label:compadd -a dev_tmp' \
+ 'device-paths: device path:_canonical_paths -A dpath_tmp -N -M "r:|/=* r:|=*" device-paths device\ path' \
+ 'directories:mount point:_canonical_paths -A mp_tmp -N -M "r:|/=* r:|=*" directories mount\ point' && ret=0
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-08-02 15:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-02 15:10 [PATCH] _df: Complete mounted device and mount points Daniel Shahaf
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).