17591: new _losetup and move a couple of functions to the Linux directory

4 files changed, 17 insertions, 61 deletions

diff --git a/Completion/Linux/Command/.distfiles b/Completion/Linux/Command/.distfiles
index 96d9db3ed..20549b37e 100644
--- a/Completion/Linux/Command/.distfiles
+++ b/Completion/Linux/Command/.distfiles
@@ -1,4 +1,4 @@
 DISTFILES_SRC='
 .distfiles
-_mondo
+_losetup _modutils _mondo _valgrind
 '
diff --git a/Completion/Linux/Command/_losetup b/Completion/Linux/Command/_losetup
new file mode 100644
index 000000000..16b726c8e
--- /dev/null
+++ b/Completion/Linux/Command/_losetup
@@ -0,0 +1,14 @@
+#compdef losetup
+
+local cyphers
+cyphers=( /proc/crypto/cipher/*(N:t) )
+cyphers="${cyphers[@]%-*}"
+
+_arguments -S \
+  '(- 2)'{--delete,--detach,-d}'[detach from specified loop device]' \
+  '(-d --delete --detach -e --encryption)'{-e,--encryption}"+[enable encryption]:cypher:( $cyphers )" \
+  '(-d --delete --detach -o --offset)'{-o,--offset}'+[specify data start is offset]:offset (bytes)' \
+  '(-d --delete --detach -p --pass-fd)'{-p,--pass-fd}'+[read passphrase from specified file descriptor]:file descriptor:_file_descriptors' \
+  '(-d --delete --detach -k --keybits)'{-k,--keybits}'+[set the number of bits to use in key]:key size:(64 128 160 192 256)' \
+  '1:device:_files -g loop\*' \
+  '(-d --delete --detach)2:file:_files'
diff --git a/Completion/Unix/Command/.distfiles b/Completion/Unix/Command/.distfiles
index 510b4822b..e013f1aa2 100644
--- a/Completion/Unix/Command/.distfiles
+++ b/Completion/Unix/Command/.distfiles
@@ -13,10 +13,9 @@ _cpio         _getconf      _lp           _pbm          _sudo         _zdump
 _cvs          _gnu_generic  _ls           _perl         _tar          _zip
 _dd           _gprof        _lynx         _perldoc      _telnet       _pine
 _dict         _grep         _lzop         _prcs         _tiff         _elm
-_diff         _gs           _make         _psutils      _tin	_apm  _mail
-_loadkeys     _modutils     _ruby         _samba        _sysctl       _links
+_diff         _gs           _make         _psutils      _tin	      _mail
+_loadkeys     _apm          _ruby         _samba        _sysctl       _links
 _user_admin   _rsync        _arping	  _spamassassin _mtools	      _fsh
 _chkconfig    _cdcd         _irssi	  _sccs         _texinfo      _ant
 _global       _global_tags  _figlet       _ifconfig     _last         _larch
-_valgrind
 '
diff --git a/Completion/Unix/Command/_valgrind b/Completion/Unix/Command/_valgrind
deleted file mode 100644
index 00aa8d78d..000000000
--- a/Completion/Unix/Command/_valgrind
+++ /dev/null
@@ -1,57 +0,0 @@
-#compdef valgrind 
-#Generated by
-#   simple2long.xsl
-#   args.xsl
-#   Post-handedits
-#   For details see:
-#       http://www.geocities.com/f_rosencrantz/xml_completion.htm
-#
-#   This is for valgrind version: 1.0.0
-#   Valgrind URL: http://developer.kde.org/~sewardj/
-
-local context state line
-typeset -A opt_args
-  _arguments   \
-    '--help[show this message]' \
-    '--version[show version]' \
-    '(--quiet)-q[run silently; only print error msgs]' \
-    '(-q)--quiet[run silently; only print error msgs]' \
-    '(--verbose)-v[be more verbose, incl counts of errors]' \
-    '(-v)--verbose[be more verbose, incl counts of errors]' \
-    '--gdb-attach=-:start GDB when errors detected? [no]:(no yes)' \
-    '--demangle=-:automatically demangle C++ names? [yes]:(no yes)' \
-    '--num-callers=-:show <num> callers in stack traces [4]:' \
-    '--error-limit=-:stop showing new errors if too many? [yes]:(no yes)' \
-    '--partial-loads-ok=-:too hard to explain here; see manual [yes]:(no yes)' \
-    '--leak-check=-:search for memory leaks at exit? [no]:(no yes)' \
-    '--leak-resolution=-:amount of bt merging in leak check [low]:(low med high)' \
-    '--show-reachable=-:show reachable blocks in leak check? [no]:(no yes)' \
-    '--sloppy-malloc=-:round malloc sizes to next word? [no]:(no yes)' \
-    '--alignment=-:set minimum alignment of allocations [4]:' \
-    '--trace-children=-:Valgrind-ise child processes? [no]:(no yes)' \
-    '--logfile-fd=-:file descriptor for messages [2=stderr]:_file_descriptors' \
-    '--freelist-vol=-:volume of freed blocks queue [1000000]:' \
-    '--workaround-gcc296-bugs=-:self explanatory [no]:(no yes)' \
-    '--suppressions=-:suppress errors described in suppressions file <filename>:_files' \
-    '--check-addrVs=-:experimental lighterweight checking? [yes]:(no yes)' \
-    '--cachesim=-:do cache profiling? [no]:(no yes)' \
-    '--I1=-:set I1 cache manually(size,assoc,line_size):' \
-    '--D1=-:set D1 cache manually(size,assoc,line_size):' \
-    '--L2=-:set L2 cache manually(size,assoc,line_size):' \
-    '--weird-hacks=-:Weird Hacks (comma separated)[no hacks selected]:(ioctl-VTIME truncate-writes)' \
-    '--sanity-level=-:level of sanity checking to do [1]:' \
-    '--single-step=-:translate each instr separately? [no]:(no yes)' \
-    '--optimise=-:improve intermediate code? [yes]:(no yes)' \
-    '--instrument=-:actually do memory checks? [yes]:(no yes)' \
-    '--cleanup=-:improve after instrumentation? [yes]:(no yes)' \
-    '--smc-check=-:check writes for s-m-c? [some]:(none some all)' \
-    '--trace-syscalls=-:show all system calls? [no]:(no yes)' \
-    '--trace-signals=-:show signal handling details? [no]:(no yes)' \
-    '--trace-symtab=-:show symbol table details? [no]:(no yes)' \
-    '--trace-malloc=-:show client malloc details? [no]:(no yes)' \
-    '--trace-sched=-:show thread scheduler details? [no]:(no yes)' \
-    '--trace-pthread=-:show pthread event details? [none]:(none some all)' \
-    '--stop-after=-:switch to real CPU after executing <number> basic blocks [infinity]:' \
-    "--dump-error=-:show translation for basic block associated with <number>'th error context [0=don't show any]:" \
-    '1:Command name:_command_names -e' \
-    '*::Args :_normal'  && return 0