diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Completion/Linux/Command/_mondo | 71 | ||||
| -rw-r--r-- | Completion/Mandrake/Command/_urpmi | 12 | ||||
| -rw-r--r-- | Completion/Unix/Command/_grep | 2 | ||||
| -rw-r--r-- | Completion/Unix/Command/_mh | 2 | ||||
| -rw-r--r-- | Completion/Unix/Command/_mount | 416 | ||||
| -rw-r--r-- | Completion/Unix/Command/_rsync | 22 | ||||
| -rw-r--r-- | Completion/Unix/Command/_subversion | 89 | ||||
| -rw-r--r-- | Completion/Unix/Command/_w3m | 33 | ||||
| -rw-r--r-- | Completion/Unix/Command/_w3mhistory | 10 | ||||
| -rw-r--r-- | Completion/Unix/Command/_wget | 18 | ||||
| -rw-r--r-- | Completion/Unix/Command/_xmlsoft | 42 | ||||
| -rw-r--r-- | Completion/Unix/Type/_diff_options | 126 | ||||
| -rw-r--r-- | Completion/Zsh/Command/_alias | 2 | ||||
| -rw-r--r-- | Completion/Zsh/Command/_precommand | 2 |
15 files changed, 503 insertions, 355 deletions
diff --git a/ChangeLog b/ChangeLog index 29c82d78d..4922ada4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2003-11-14 Oliver Kiddle <opk@zsh.org> + + * 19244: Completion/Linux/Command/_mondo, + Completion/Mandrake/Command/_urpmi, Completion/Unix/Command/_grep, + Completion/Unix/Command/_mh, Completion/Unix/Command/_mount, + Completion/Unix/Command/_rsync, Completion/Unix/Command/_subversion, + Completion/Unix/Command/_w3m, Completion/Unix/Command/_wget, + Completion/Unix/Command/_xmlsoft, Completion/Unix/Type/_diff_options, + Completion/Zsh/Command/_alias, Completion/Zsh/Command/_precommand: + various completion function fixes and updates + 2003-11-14 Doug Kearns <djkea2@mugca.its.monash.edu.au> * unposted: Completion/Unix/Command/_w3m: fix typo diff --git a/Completion/Linux/Command/_mondo b/Completion/Linux/Command/_mondo index d3ce8581b..3d3a6d09c 100644 --- a/Completion/Linux/Command/_mondo +++ b/Completion/Linux/Command/_mondo @@ -1,53 +1,54 @@ #compdef mondoarchive -local context state line expl ret=1 +local curcontext="$curcontext" state line expl ret=1 typeset -A opt_args -_arguments \ - "(-V)-O[create backup]" \ - "(-O)-V[verify backup]" \ - "(-c -C -i -n -w)-c[use CD-R as backup media]:CD-R burn speed: " \ - "(-c -C -i -n -w)-C[use CD-R as streaming device (experimental)]:CD-R burn speed: " \ - "(-c -C -i -n -w)-i[use ISO image as backup media]" \ - "(-c -C -i -n -w)-n[use NFS mountpoint as backup media]:NFS mountpoint: " \ - "(-c -C -i -n -w)-w[use CD-RW as backup media]:CD-RW burn speed: " \ - "-D[differential backup]" \ - "-E[exclude path(s) from backup]:paths to exclude from backup:->quoted_path" \ - "-I[path(s) to backup]:paths to include in backup:->quoted_path" \ - "-d[backup device]:backup device: " \ - "-g[run in fullscreen mode]" \ - "-k[path to kernel]:path to kernel:->kernel_or_magic" \ - "-m[manual eject]" \ - "-s[media size]:media size]: " \ - "-x[non-linux partition]:non-linux partition:_files -g '*(%b)'" \ - "(-1 -2 -3 -4 -5 -6 -7 -8 -9)-"{1,2,3,4,5,6,7,8,9}"[compression level]" \ - "-A[post ISO-creation command]:pre ISO-creation command: " \ - "-B[pre iSO-creation command]:post ISO-creation command: " \ - "-F[do not create floppy]" \ - "-H[create autorestore image]" \ - "-L[use lzo instead of bzip2]" \ - "-P[post-nuke tarball]:post-nuke tarball:_files -g '*.(#i)(tar.gz|tgz)'" \ - "-S[scratch directory]:scratch directory:_files -/" \ - "-T[temporary directory]:temporary directory:_files -/" \ - "-f[device with MBR]:device with MBR:_files -g '*(%b)'" \ - "-l[bootloader type]:bootloader type:(GRUB LILO)" \ - && ret=0 +_arguments -C \ + '(-V)-O[create backup]' \ + '(-O)-V[verify backup]' \ + '(-c -C -i -n -w)-c[use CD-R as backup media]:CD-R burn speed' \ + '(-c -C -i -n -w)-C[use CD-R as streaming device (experimental)]:CD-R burn speed' \ + '(-c -C -i -n -w)-i[use ISO image as backup media]' \ + '(-c -C -i -n -w)-n[use NFS mountpoint as backup media]:NFS mountpoint' \ + '(-c -C -i -n -w)-w[use CD-RW as backup media]:CD-RW burn speed' \ + '-D[differential backup]' \ + '-E[exclude path(s) from backup]:paths to exclude from backup:->quoted_path' \ + '-I[path(s) to backup]:paths to include in backup:->quoted_path' \ + '-d[backup device]:backup device' \ + '-g[run in fullscreen mode]' \ + '-k[path to kernel]:path to kernel:->kernel_or_magic' \ + '-m[manual eject]' \ + '-s[media size]:media size]' \ + '-x[non-linux partition]:non-linux partition:_files -g "*(%b)"' \ + '(-1 -2 -3 -4 -5 -6 -7 -8 -9)-'{1,2,3,4,5,6,7,8,9}'[compression level]' \ + '-A[post ISO-creation command]:pre ISO-creation command' \ + '-B[pre iSO-creation command]:post ISO-creation command' \ + '-F[do not create floppy]' \ + '-H[create autorestore image]' \ + '-L[use lzo instead of bzip2]' \ + '-P[post-nuke tarball]:post-nuke tarball:_files -g "*.(#i)(tar.gz|tgz)"' \ + '-S[scratch directory]:scratch directory:_files -/' \ + '-T[temporary directory]:temporary directory:_files -/' \ + '-f[device with MBR]:device with MBR:_files -g "*(%b)"' \ + '-l[bootloader type]:bootloader type:(GRUB LILO)' && ret=0 case $state in - quoted_path ) + quoted_path) local suf="/ \t\n" [[ -n $compstate[quote] ]] && { suf="$compstate[quote]$suf"; compset -q; } _files -r $suf && ret=0 ;; - kernel_or_magic ) + kernel_or_magic) _tags kernel magic while _tags; do - _requested magic expl "keywords" \ + _requested magic expl "keyword" \ compadd -- FAILSAFE && ret=0 _requested kernel expl "path to kernel image" \ - _files && ret=0 + _files && ret=0 + + (( ret )) || break done ;; esac -return $ret +return ret diff --git a/Completion/Mandrake/Command/_urpmi b/Completion/Mandrake/Command/_urpmi index 7f9387f91..2376b09de 100644 --- a/Completion/Mandrake/Command/_urpmi +++ b/Completion/Mandrake/Command/_urpmi @@ -30,7 +30,7 @@ _urpmi_rpms() { _tags rpms files while _tags; do - if _requested rpms expl 'urpmi RPMs'; then + if _requested rpms expl 'urpmi RPM'; then local -a synthesis pkgs synthesis=(/var/lib/urpmi/synthesis.*(N)) if [[ $#synthesis -gt 0 ]]; then @@ -43,11 +43,13 @@ _urpmi_rpms() { fi fi - _requested files expl '(S)RPM files' \ + _requested files expl '(S)RPM file' \ _files -g '*.(#i)rpm' && ret=0 + + (( ret )) || break done - return $ret + return ret } _urpmi_media_url() { @@ -94,7 +96,7 @@ _urpmi() { "(--distrib):name of media: " \ "(--distrib):media URL:_urpmi_media_url" \ "(--distrib): :(with)" \ - "(--distrib):relative path to hdlist file: " \ + "(--distrib):relative path to hdlist file" \ && ret=0 ;; urpmi.removemedia ) @@ -161,7 +163,7 @@ _urpmi() { "(--help -h)-r[print version and release too with name]" \ "(--help -h)-u[remove package if a better version is already installed]" \ "(--help -h)-v[verbose mode]" \ - "(--help -h)*:urpmi package name: " \ + "(--help -h)*:urpmi package name" \ && ret=0 ;; esac diff --git a/Completion/Unix/Command/_grep b/Completion/Unix/Command/_grep index b1dd8aa45..0c0f8b4a2 100644 --- a/Completion/Unix/Command/_grep +++ b/Completion/Unix/Command/_grep @@ -69,5 +69,5 @@ arguments=( $arguments[@] _pick_variant -c "$command" gnu=gnu unix --help || arguments=( ${arguments:#(|*\)(\*|))--*} ) -_arguments -s $arguments[@] +_arguments -S -s $arguments[@] diff --git a/Completion/Unix/Command/_mh b/Completion/Unix/Command/_mh index bf30b000d..6f965ce4f 100644 --- a/Completion/Unix/Command/_mh +++ b/Completion/Unix/Command/_mh @@ -1,4 +1,4 @@ -#compdef ali dist flist flists folder folders forw comp inc mark refile repl scan show next prev packf rmf rmm pick whom mhn mhpath mhlist mhstore mhshow mhparam mhmail +#compdef ali burst dist flist flists folder folders forw comp inc mark refile repl scan show next prev packf rmf rmm pick whom mhn mhpath mhlist mhstore mhshow mhparam mhmail # Completion for all possible MH commands. local mymhdir=${$(_call_program mhpath mhpath + 2>/dev/null):-~/Mail} diff --git a/Completion/Unix/Command/_mount b/Completion/Unix/Command/_mount index e1f32f392..7c001844d 100644 --- a/Completion/Unix/Command/_mount +++ b/Completion/Unix/Command/_mount @@ -4,29 +4,19 @@ if [[ "$OSTYPE" == cygwin ]]; then if [[ "$service" == mount ]] ; then _arguments -s \ - mount \ - '(-b -t --text)--binary[Unix line endings LF]' \ - '(--binary -t --text)-b[Unix line endings LF]' \ - '(-f)--force[be silent]' \ - '(--force)-f[be silent]' \ - '(-s -u --user)--system[system-wide mount point]' \ - '(--system -u --user)-s[system-wide mount point]' \ - '(-t -b --binary)--text[(default) DOS line endings CR-LF]' \ - '(--text -b --binary)-t[(default) DOS line endings CR-LF]' \ - '(-u -s --system)--user[(default)user private mount point]' \ - '(--user -s --system)-u[(default)user private mount point]' \ - '(-x -X --cygwin-executable)--executable[all files under mountpoint are executables]' \ - '(--executable -X --cygwin-executable)-x[all files under mountpoint are executables]' \ - '(-X -x --executable)--cygwin-executable[all files under mountpoint are cygwin executables]' \ - '(--cygwin-executable -x --executable)-X[all files under mountpoint are cygwin executables]' \ - ':Windows path:' \ - ':Unix path:_path_files -P/ -W "(/)" -/' \ + '(-b -t --text --binary)'{-b,--binary}'[Unix line endings LF]' \ + '(-f --force)'{-f,--force}'[be silent]' \ + '(-s -u --user --system)'{-s,--system}'[system-wide mount point]' \ + '(-t -b --binary --text)'{-t,--text}'[DOS line endings CR-LF]' \ + '(-u -s --system --user)'{-u,--user}'[user private mount point]' \ + '(-x -X --executable --cygwin-executable)'{-x,--executable}'[all files under mountpoint are executables]' \ + '(-x -X --executable --cygwin-executable)'{-X,--cygwin-executable}'[all files under mountpoint are cygwin executables]' \ + ':Windows path:' \ + ':Unix path:_path_files -P/ -W "(/)" -/' \ - control \ - '(-i -p --show-cygdrive-prefix -c --change-cygdrive-prefix)--import-old-mounts[import old mounts]' \ - '(--import-old-mounts -p --show-cygdrive-prefix -c --change-cygdrive-prefix)-i[import old mounts]' \ - '(-p -i --import-old-mounts -c --change-cygdrive-prefix)--show-cygdrive-prefix[show cygdrive prefix]' \ - '(--show-cygdrive-prefix -i --import-old-mounts -c --change-cygdrive-prefix)-p[show cygdrive prefix]' \ - '(-c -i --import-old-mounts -p --show-cygdrive-prefix)--change-cygdrive-prefix[cygdrive prefix]:cygdrive prefix (POSIX path):_files -P/ -W "(/)" -/' \ - '(--change-cygdrive-prefix -i --import-old-mounts -p --show-cygdrive-prefix)-c[cygdrive prefix]:cygdrive prefix (POSIX path):_files -P/ -W "(/)" -/' + '(-)'{-i,--import-old-mounts}'[import old mounts]' \ + '(-)'{-p,--show-cygdrive-prefix}'[show cygdrive prefix]' \ + '(-)'{-c,--change-cygdrive-prefix}'[cygdrive prefix]:cygdrive prefix (POSIX path):_files -P/ -W "(/)" -/' \ return else @@ -69,11 +59,11 @@ if (( ! $+_fs_any )); then '(ro)rw[mount file system read-write]' ) _nfs_access=( - 'acregmin[specify cached file attributes minimum hold time]:cached file attributes minimum hold time:' - 'acregmax[specify cached file attributes maximum hold time]:cached file attributes maximum hold time:' - 'acdirmin[specify cached directory attributes minimum hold time]:cached directory attributes minimum hold time:' - 'acdirmax[specify cached directory attributes maximum hold time]:cached directory attributes maximum hold time:' - 'actimeo[set all attributes'"'"' cache timeout]:set all attributes'"'"' cache timeout:' + 'acregmin[specify cached file attributes minimum hold time]:cached file attributes minimum hold time' + 'acregmax[specify cached file attributes maximum hold time]:cached file attributes maximum hold time' + 'acdirmin[specify cached directory attributes minimum hold time]:cached directory attributes minimum hold time' + 'acdirmax[specify cached directory attributes maximum hold time]:cached directory attributes maximum hold time' + "actimeo[set all attributes' cache timeout]:cache timeout" ) _fs_nfs=( 'rsize[specify read buffer size]:read buffer size:(8192)' @@ -81,10 +71,10 @@ if (( ! $+_fs_any )); then '(soft)hard[hang process on server crash (so to say)]' '(hard)soft[allow time out on server crash]' '(nolock)lock[use locking]' - '(lock)nolock[don'"'"'t use locking]' - 'timeo[specify initial timeout for UDP]:initial timeout for UDP:' - 'retrans[set number of NFS retransmissions]:number of NFS retransmissions:' - 'retry[specify number of mount failure retries]:mount failure retries:' + "(lock)nolock[don't use locking]" + 'timeo[specify initial timeout for UDP]:initial timeout for UDP' + 'retrans[set number of NFS retransmissions]:number of NFS retransmissions' + 'retry[specify number of mount failure retries]:mount failure retries' '(fg)bg[retry in the background]' '(bg)fg[retry in the foreground]' '(nintr)intr[allow operations to be interrupted]' @@ -92,21 +82,21 @@ if (( ! $+_fs_any )); then '(nfsv3)nfsv2[use NFS version 2]' '(nfsv2)nfsv3[use NFS version 3]' 'proto[specify protocol]:protocol:(udp tcp)' - 'port[specify server port number]:server port number:' + 'port[specify server port number]:server port number' 'proplist[allow property lists]' "$_nfs_access[@]" - 'nocto[don'"'"'t get fresh attributes on open]' - 'noac[don'"'"'t set attribute caching]' + "nocto[don't get fresh attributes on open]" + "noac[don't set attribute caching]" ) _nfs_ufs=( '(nodev)dev[interpret devices]' - '(dev)nodev[don'"'"'t interpret devices]' + "(dev)nodev[don't interpret devices]" '(nosuid)suid[use suid and sgib bits]' '(suid)nosuid[ignore suid and sgid bits]' '(nosync)sync[do I/O synchronously]' '(sync)nosync[do all I/O asynchronously]' '(noexec)exec[permit execution of binaries]' - '(exec)noexec[don'"'"'t allow execution of binaries]' + "(exec)noexec[don't allow execution of binaries]" '(nogrpid)grpid[new file gets group ID of directory]' '(grpid)nogrpid[new file gets fsgid of current process]' ) @@ -144,7 +134,7 @@ if (( ! $+_fs_any )); then 'posix[exchange pathconf info on NFS version 2 mount]' 'secure[use DES encryption]' 'grpid[inherit group id of parent directory]' - '(acl)noacl[don'"'"'t use access control lists]' + "(acl)noacl[don't use access control lists]" '(noacl)acl[use access control lists for this mount]' 'noac[no attribute or directory caching]' 'shortdev[server lack support for 32-bit device special files]' @@ -219,33 +209,33 @@ if (( ! $+_fs_any )); then '(nosuid)suid[use suid and sgib bits]' ) _fs_ufs=( - '(atime)noatime[don'"'"'t update access time]' + "(atime)noatime[don't update access time]" 'f[fake an /etc/mnttab entry]' - 'm[don'"'"'t make an /etc/mnttab entry]' + "m[don't make an /etc/mnttab entry]" '(noforcedirection)forcedirection[do I/O synchronously]' '(forcedirection)noforcedirection[do all I/O asynchronously]' '(nointr)intr[allow operations to be interrupted]' '(intr)nointr[prevent operations from being interrupted]' - '(nolargefiles)largefiles[don'"'"' restrict file size]' + "(nolargefiles)largefiles[don't restrict file size]" '(largefiles)nolargefiles[restrict file size]' '(nologging)logging[log transactions]' '(logging)nologging[log transactions]' - 'onerror[action to recover from error]:action(panic lock umount)' + 'onerror[action to recover from error]:action:(panic lock umount)' 'quota[turn on quotas]' '(ro rw)rq[mount file system read-write with quotas]' "$_fs_s5fs[@]" ) _fs_tmpfs=( - 'size[set file system size]:size:' + 'size[set file system size]:size' ) _fs_pcfs=( '(nofoldcase)foldcase[force filenames to lowercase]' - '(foldcase)nofoldcase[don'"'"'t force filenames to lowercase]' + "(foldcase)nofoldcase[don't force filenames to lowercase]" ) _fs_hsfs=( 'nrr[no rock ridge]' 'notraildot[no trail dot when no extension]' - 'nomaplcase[don'"'"'t force lowercase]' + "nomaplcase[don't force lowercase]" 'nosuid[ignore suid and sgid bits]' ) _fs_nfs=( @@ -257,13 +247,13 @@ if (( ! $+_fs_any )); then '(intr)nointr[prevent operations from being interrupted]' '(sec secure)kerberos[use kerberos authentication]' 'noac[no attribute caching]' - 'port[server IP port number]:port:' + 'port[server IP port number]:port' 'posix[posix semantics]' 'proto[specify protocol]:protocol:'\("$(grep -v '^#' /etc/netconfig 2> /dev/null | cut -d ' ' -f 1)"\) 'public[force public file handle]' '(noquota)quota[enable quotas]' '(quota)noquota[disable quotas]' - 'timeo[specify initial timeout for UDP]:initial timeout for UDP:' + 'timeo[specify initial timeout for UDP]:initial timeout for UDP' 'retrans[set number of NFS retransmissions]:number of NFS retransmissions:(5)' 'retry[specify number of mount failure retries]:mount failure retries:(10000)' 'rsize[specify read buffer size]:read buffer size:(8192)' @@ -277,7 +267,7 @@ if (( ! $+_fs_any )); then _fs_cachefs=( 'backfstype[type of the back file system]:back file system type:(nfs hsfs)' 'backpath[specify back file system location]:back file system location:_files -/' - 'cacheid[specify a cache ID]:cache ID:' + 'cacheid[specify a cache ID]:cache ID' 'local-access[check permissions locally]' 'noconst[disable cache consistency checking]' 'purge[purge any cached information]' @@ -313,10 +303,10 @@ if (( ! $+_fs_any )); then '(rw suid dev exec auto nouser async)defaults[use default options]' '(nodev)dev[interpret devices]' '(noexec)exec[permit execution of binaries]' - '(atime)noatime[don'"'"'t update access time]' + "(atime)noatime[don't update access time]" '(auto)noauto[can only be mounted explicitly]' - '(dev)nodev[don'"'"'t interpret devices]' - '(exec)noexec[don'"'"'t allow execution of binaries]' + "(dev)nodev[don't interpret devices]" + "(exec)noexec[don't allow execution of binaries]" '(suid)nosuid[ignore suid and sgid bits]' '(user)nouser[can only be mounted by root]' 'remount[mount already mounted file system]' @@ -324,45 +314,58 @@ if (( ! $+_fs_any )); then '(ro)rw[mount file system read-write]' '(nosuid)suid[use suid and sgib bits]' '(async)sync[do I/O synchronously]' - '(nouser noexec nosuid nodev)user[allow normal users to mount]' + 'dirsync[perform directory updates synchronously]' + 'loop[use loopback device]:loopback device:_files' + 'encryption[enable encryption]:cypher' + 'keybits[set number of bits in encryption key]:key size:(64 128 160 192 256)' + 'offset[specify data start for loopback mount]:offset (bytes)' ) _fs_affs=( - 'uid[set owner of root]:user ID:' - 'gid[set group of root]:group ID:' - 'setuid[set owner of all files]:user ID:' - 'setgid[set group of all files]:group ID:' - 'mode[set file permissions]:file permission bits:' - 'protect[don'"'"'t allow changes to permissions]' + 'uid[set owner of root]:user ID' + 'gid[set group of root]:group ID' + 'setuid[set owner of all files]:user ID' + 'setgid[set group of all files]:group ID' + 'mode[set file permissions]:file permission bits' + "protect[don't allow changes to permissions]" 'usemp[set owner of root to owner of mount point]' 'verbose[print message per mount]' - 'prefix[prefix before volume name (link)]:prefix string:' - 'volume[prefix before '"'"'/'"'"' (symlink)]:prefix string:' - 'reserved[set number of unused blocks at start of device]:number of unused blocks:' - 'root[specify location of the root block]:root block location:' + 'prefix[prefix before volume name when following link]:prefix string' + "volume[prefix before '/' when following link]:prefix string" + 'reserved[set number of unused blocks at start of device]:number of unused blocks' + 'root[specify location of the root block]:root block location' 'bs[specify block size]:block size:(512 1024 2048 4192)' ) _fs_ext2=( '(minixdf)bsddf[select bsddf behavior]' '(bsddf)minixdf[select bsddf behavior]' '(nocheck)check[set checking level]::checking level:((normal\:check\ inode\ and\ block\ bitmaps\ on\ mount strict\:check\ on block\ deallocation none\:no\ checking))' + 'debug[print debugging info upon each (re)mount]' 'errors[specify behavior on error]:error behavior:((continue\:ignore\ errors remount-ro\:remount\ file\ system\ read-only panic\:panic\ and\ halt\ system))' '(nogrpid bsdgroups sysvgroups)grpid[new file gets group ID of directory]' '(grpid nogrpid sysvgroups)bsdgroups[new file gets group ID of directory]' '(grpid bsdgroups sysvgroups)nogrpid[new file gets fsgid of current process]' '(grpid bsdgroups nogrpid)sysvgroups[new file gets fsgid of current process]' - 'resgid[specify access to reserved space (group ID)]:group ID:' - 'resuid[specify access to reserved space (user ID)]:user ID:' - 'sb[specify super block number]:super block number:' + 'resgid[specify access to reserved space (group ID)]:group ID' + 'resuid[specify access to reserved space (user ID)]:user ID' + 'sb[specify super block number]:super block number' + 'nouid32[disable 32-bit UIDs and GIDs]' ) _fs_fat=( - 'blocksize[specify block size]:block size:(512 1024)' - 'uid[specify user ID of all files]:user ID:' - 'gid[specify group ID of all files]:group ID:' - 'umask[specify umask]:umask value (octal):' + 'blocksize[specify block size]:block size:(512 1024 2048)' + 'uid[specify user ID of all files]:user ID' + 'gid[specify group ID of all files]:group ID' + 'umask[specify umask]:umask value (octal)' + 'dmask[specify umask for directories only]:umask value (octal)' + 'fmask[specify umask for files only]:umask value (octal)' 'check[specify checking level]:checking level:((relaxed\:accept\ upper\ and\ lower\ case,\ truncate\ long\ name normal\:like\ '"'\`'"'relaxed'"\\'"',\ but\ reject\ special\ characters strict\:like\ '"'\`'"'normal'"\\'"',\ but\ no\ long\ parts))' + 'codepage[specify codepage for converting filenames to short form]:codepage' 'conf[specify CR/NL conversion]:CR/NL conversion mode:((binary\:no\ translation text\:conversion\ on\ all\ files auto\:perform\ translation\ on\ file\ without\ binary\ extension))' + 'conv[convert form of text files]:mode:(binary text auto)' + 'cvf_format[use specified compressed volume format module]:module' + 'cvf_option[pass option to CVF module]:option' 'debug[debug mode]' - 'fat[specify fat type]:fat type (bit):(12 16)' + 'fat[specify fat type]:fat type (bit):(12 16 32)' + 'iocharset[character set to use for converting from 8 bit to unicode]:character set' 'quiet[quiet mode]' ) _fs_ext3=( @@ -378,38 +381,70 @@ if (( ! $+_fs_any )); then 'posix[allow file names only differing in case]' 'nonumtail[try short name before number extension]' '(uni_xlate)utf8[mount the filesystem in UTF8 mode]' + 'shortname[specify handling of 8.3 filenames]:mode:(lower win95 winnt mixed)' ) _fs_hpfs=( - 'uid[specify user ID of all files]:user ID:' - 'gid[specify group ID of all files]:group ID:' - 'umask[specify umask]:umask value (octal):' + 'uid[specify user ID of all files]:user ID' + 'gid[specify group ID of all files]:group ID' + 'umask[specify umask]:umask value (octal)' 'case[specify file name conversion]:file name conversion:((lower\:convert\ to\ lower\ case asis\:no\ conversion))' 'conv[specify CR elimination]:CR elimination:((binary\:no\ elimination test\:delete\ CRs\ \(e.g.\ before\ NL\) auto\:sometimes\ yes,\ sometimes\ not))' - 'nocheck[don'"'"'t abort mount on consistency check failure]' + "nocheck[don't abort mount on consistency check failure]" ) _fs_iso9660=( 'norock[disable Rock Ridge extensions]' + 'nojoliet[disable Microsoft Joliet extensions]' 'check[specify file name conversion]:file name conversion:((relaxed\:convert\ to\ lower\ case\ before\ lookup strict\:no\ conversion))' - 'uid[specify user ID of all files]:user ID:' - 'gid[specify group ID of all files]:group ID:' + 'uid[specify user ID of all files]:user ID' + 'gid[specify group ID of all files]:group ID' 'map[specify non-Rock Ridge name conversion]:file name conversion:((normal\:map\ upper\ to\ lower,\ ignore\ \;1,\ map\ \;\ to\ . off\:no\ conversion))' - 'mode[specify permissions]:file access permissions:' + 'mode[specify permissions]:file access permissions' 'unhide[show hidden and associated files]' 'block[specify block size]:block size:(512 1024 2048)' 'cruft[ignore high bits of file length]' + 'session[select session number on multisession CD]:session' + 'sbsector[specify starting sector]:sector' + 'iocharset[character set when converting from 8 bit to unicode (Joliet)]:character set' + 'utf8[mount the filesystem in UTF8 mode (Joliet)]' + ) + _fs_ntfs=( + 'iocharset[character set to use when returning file names]:character set' + '(uni_xlate)utf8[use UTF-8 for converting file names]' + '(utf8)uni_xlate[translate unicode to escaped sequences]:type:(0 1 2)' + 'posix[distinguish upper and lower case]:state:((0\:off 1\:on))' + 'uid[specify user ID of all files]:user ID' + 'gid[specify group ID of all files]:group ID' + 'umask[specify umask]:umask value (octal)' + ) + _fs_reiserfs=( + 'conv[mount 3.5 fs using 3.6 format for new objects]' + 'hash[choose hash type]:hash function:(rupasov tea r5 detect)' + '(no_unhashed_relocation)hashed_relocation[tune the block allocator]' + 'noborder[disable border allocator algorithm]' + 'nolog[disable journalling]' + 'notail[disable packing of files into the tree]' + '(hashed_relocation)no_unhashed_relocation[tune the block allocator]' + 'replayonly[replay but do not mount]' + 'resize[assume the device has this many blocks]:number of blocks' ) _fs_smbfs=( "$_fs_nfs[@]" ) + _fs_tmpfs=( + 'size[set file system size]:size (bytes)' + 'mode[set root directory permissions]:mode' + 'nr_blocks[set number of blocks]:blocks' + 'nr_inodes[set number of inodes]:inodes' + ) _fs_udf=( - 'uid[specify user ID of all files]:user ID:' - 'gid[specify group ID of all files]:group ID:' - 'umask[specify umask]:umask value (octal):' + 'uid[specify user ID of all files]:user ID' + 'gid[specify group ID of all files]:group ID' + 'umask[specify umask]:umask value (octal)' 'unhide[show hidden and associated files]' 'undelete[show deleted files]' 'bs[set the block size]:block size:2048' 'novrs[skip volume sequence recognition]' - 'session[set the CDROM session]:session:' + 'session[set the CDROM session]:session' 'anchor[override standard anchor location]:anchor location:256' - 'lastblock[set the last block of the file system]:last block:' + 'lastblock[set the last block of the file system]:last block' ) _fs_ufs=( 'ufstype[set ufs type]:ufs type:(old 44bsd sun sunx86 nextstep nextstep-cd openstep)' @@ -432,19 +467,8 @@ if (( ! $+_fs_any )); then '(quota usrquota)uqnoenforce[enable user quotas without enforcement]' '(gqnoenforce)grpquota[enable group quotas]' '(grpquota)gqnoenforce[enable group quotas without enforcement]' - 'sunit[specify stripe unit]:size:' - 'swidth[specify stripe width]:size:' - ) - _fs_reiserfs=( - 'conv[mount 3.5 fs using 3.6 format for new objects]' - 'hash[choose hash type]:hash function:(rupasov tea r5 detect)' - '(no_unhashed_relocation)hashed_relocation[tune the block allocator]' - 'noborder[disable border allocator algorithm]' - 'nolog[disable journalling]' - 'notail[disable packing of files into the tree]' - '(hashed_relocation)no_unhashed_relocation[tune the block allocator]' - 'replayonly[replay but do not mount]' - 'resize[assume the device has this many blocks]:number of blocks:' + 'sunit[specify stripe unit]:size' + 'swidth[specify stripe width]:size' ) ;; freebsd*) @@ -454,14 +478,14 @@ if (( ! $+_fs_any )); then 'force[force R/W mount of unclean filesystem]' 'fstab[use options listed in /etc/fstab]' 'noasync[do I/O synchronously]' - 'noatime[don'"'"'t update access time]' + "noatime[don't update access time]" 'noauto[can only be mounted explicitly]' 'noclusterr[disable read clustering]' 'noclusterw[disable write clustering]' - 'nodev[don'"'"'t interpret devices]' - 'noexec[don'"'"'t allow execution of binaries]' + "nodev[don't interpret devices]" + "noexec[don't allow execution of binaries]" 'nosuid[ignore suid and sgid bits]' - 'nosymfollow[don'"'"'t follow symlinks]' + "nosymfollow[don't follow symlinks]" 'rdonly[mount file system read-only]' '(async)sync[do all I/O synchronously]' 'suiddir[allow suid bits on directories]' @@ -470,14 +494,14 @@ if (( ! $+_fs_any )); then ) _fs_iso9660=( 'extatt[enable use of extended attributes]' - 'gens[don'"'"'t strip version number on files]' - 'joliet[don'"'"'t use any Joliet extensions]' - 'rrip[don'"'"'t use any Rockridge extensions]' + "gens[don't strip version number on files]" + "joliet[don't use any Joliet extensions]" + "rrip[don't use any Rockridge extensions]" 'strictjoliet[relax checking for Supplementary Volume Descriptor Flags field which is set to a wrong value on some Joliet formatted disks]' ) _fs_std=( - 'nodev[don'"'"'t interpret devices]' - 'noexec[don'"'"'t allow execution of binaries]' + "nodev[don't interpret devices]" + "noexec[don't allow execution of binaries]" 'nosuid[ignore suid and sgid bits]' 'rdonly[mount file system read-only]' 'union[cause the namespace at the mount point to appear as the union of the mounted filesystem and the existing directory]' @@ -508,7 +532,7 @@ if [[ "$service" = mount ]]; then case "$OSTYPE" in aix*) args=( -s - '-a[mount all filesystems in /etc/fstab]' + '(:)-a[mount all filesystems in /etc/fstab]' '-f[forced mount]' '-n[remote node]:remote node:_hosts' '-p[mount as removable file system]' @@ -526,7 +550,7 @@ if [[ "$service" = mount ]]; then '-a[mount all filesystems in /etc/fstab]' '-b[mount all filesystems in /etc/fstab except those listed]:list of directories:_dir_list -s,' '-c[check any dirty filesystems before mounting]' - '-f[fake a new /etc/mtab entry, but don'\''t mount any filesystems]' + "-f[fake a new /etc/mtab entry, but don't mount any filesystems]" '-h[mount all filesystems associated with host]:hostnames:_hosts' '-n[mount filesystem without making entry in /etc/mtab]' '-o[specify file system options]:file system option:->fsopt' @@ -541,25 +565,34 @@ if [[ "$service" = mount ]]; then ;; linux*) args=( -s - '-h[show help]' - '-V[show version]' - '-v[verbose mode]' - '(-o)-a[mount all filesystems in fstab]' - '-F[fork off one child per device]' - '-f[fake mount]' - '-n[don'"'"'t write /etc/mtab]' - '-s[tolerate sloppy mount options]' - '-r[mount read-only]' - '-w[mount read/write]' - '-t[specify file system type]:file system type:->fslist' - '-o[specify file system options]:file system option:->fsopt' + '(- :)-h[show help]' + '(- :)-V[show version]' + '(-V -h)-v[verbose mode]' + '(-V -h)-p[specify file descriptor from which to read passphrase]:file descriptor:_file_descriptors' + '(-V -h -o :)-a[mount all filesystems in fstab]' + '(-V -h)-F[fork off one child per device]' + '(-V -h)-f[fake mount]' + "(-V -h)-i[don't call /sbin/mount.<fs> helper]" + '(-V -h)-l[output ext2, ext3 and XFS labels]' + "(-V -h)-n[don't write /etc/mtab]" + '(-V -h)-s[tolerate sloppy mount options]' + '(-V -h -w)-r[mount read-only]' + '(-V -h -r)-w[mount read/write]' + '(-V -h)-L[mount partition with specified label]:label' + '(-V -h)-U[mount partition with specified uuid]:uuid' + '(-V -h)-t[specify file system type]:file system type:->fslist' + '(-V -h)-O[with -a, restrict filesystems by options]:file system option:->fsopt' + '(-V -h -a -O)-o[specify file system options]:file system option:->fsopt' + '(: -)--bind[remount part of filesystem elsewhere]:old directory:_directories:new directory:_directories' + '(: -)--rbind[remount part of filesystem including submounts elsewhere]:old directory:_directories:new directory:_directories' + '(: -)--move[move part of filesystem elsewhere]:old directory:_directories:new directory:_directories' ':dev or dir:->devordir' ':mount point:_files -/' ) ;; osf*) args=( -s - '(-o)-a[mount all filesystems in fstab]' + '(-o :)-a[mount all filesystems in fstab]' '-d[mount even if not unmounted]' '-e[list all mount points]' '-f[fake mount]' @@ -581,8 +614,8 @@ if [[ "$service" = mount ]]; then '(-p -v)-F[specify file system type]:file system type:_file_systems' '(-a -v)-p[print mounted file systems]' '(-p -a)-v[print mounted file systems verbosely]' - '(-p -v)-V[fake mount]' - '(-p -v)-m[don'"'"'t write /etc/mnttab]' + '(-p -v)-V[echo command-line but do not execute]' + "(-p -v)-m[don't write /etc/mnttab]" '(-p -v)-g[mount globally]' '(-p -v)-o[specify file system options]:file system option:->fsopt' '(-p -v)-O[overlay mount]' @@ -595,7 +628,7 @@ if [[ "$service" = mount ]]; then ;; freebsd*) args=( -s - '-a[mount all filesystems in fstab]' + '(:)-a[mount all filesystems in fstab]' '-d[cause everything to be done except for the actual system call]' '-f[forced mount]' '-o[specify file system options]:file system option:->fsopt' @@ -614,7 +647,7 @@ if [[ "$service" = mount ]]; then # Default for all other systems. Dunno. args=( -s - '(-o)-a[mount all filesystems in fstab]' + '(-o :)-a[mount all filesystems in fstab]' '-t[specify file system type]:file system type:_file_systems' '-o[specify file system options]:file system option:->fsopt' '-f[fake mount]' @@ -634,7 +667,7 @@ else case "$OSTYPE" in aix*) args=( - '-a[unmount all mounted file systems]' + '(*)-a[unmount all mounted file systems]' '-f[force unmount]' '-n[remote node]:remote node:_hosts' '-t[specify file system type]:file system type:_file_systems' @@ -651,25 +684,46 @@ else '-v[verbose]' ) ;; + linux*) + args=( + '(- *)-h[show help]' + '(- *)-V[show version]' + '(-V -h)-v[verbose mode]' + "(-V -h)-n[don't write /etc/mtab]" + '(-V -h)-r[remount read-only on failure]' + '(-V -h)-d[for loopback mount, free loop device]' + '(-V -h *)-a[unmount all file systems from /etc/mtab]' + '(-V -h)-t[specify file system type]:file system type:_file_systems' + '(-V -h *)-O[with -a, restrict filesystems by options]:file system option:->fsopt' + '(-V -h)-f[force unmount]' + '(-V -h)-l[lazy unmount]' + '*:dev or dir:->udevordir' + ) + ;; freebsd*) args=( - '-a[unmount all mounted file systems]' - '-A[unmount all mounted file systems except the root]' - '-f[force unmount]' - '-h[unmount all filesystems associated with host]:hostnames:_hosts' + '(*)-a[unmount all mounted file systems]' + '-A[unmount all mounted file systems except the root]' + '-f[force unmount]' + '-h[unmount all filesystems associated with host]:hostnames:_hosts' '-t[unmount all filesystems of specified type]:file system type:->fslist' '-v[verbose mode]' '*:dev or dir:->udevordir' ) ;; + solaris*) + args=( + '-a[unmount all mounted file systems]' + '-f[force unmount]' + '-V[echo command-line but do not execute]' + '-o[specify file system options]:file system option:->fsopt' + '*:dev or dir:->udevordir' + ) + ;; *) - args=( \ - '-h[show help]' - '-V[show version]' + args=( '-v[verbose mode]' - '-n[don'"'"'t write /etc/mtab]' - '-r[remount read-only on failure]' - '-a[unmount all file systems from /etc/mtab]' + '(*)-a[unmount all file systems from /etc/mtab]' '-t[specify file system type]:file system type:_file_systems' '*:dev or dir:->udevordir' ) @@ -691,66 +745,58 @@ fsopt) eval 'tmp=(' '"$_fs_'${(s:,:)^${opt_args[$typeops]:-${deffs}}}'[@]"' ')' tmp=( "$_fs_any[@]" "${(@)tmp:#}" ) - _values -s , 'file system options' "$tmp[@]" && ret=0 + _values -s , 'file system option' "$tmp[@]" && ret=0 ;; devordir) - if (( $+opt_args[-a] )); then - _message "no device or directory with option \`-a'" - else - local dev_tmp mp_tmp mline + local dev_tmp mp_tmp mline - case "$OSTYPE" in - freebsd*) - while read mline; do - case $mline[(w)1] in - \#* ) - ;; - proc) - ;; - *) - [[ $mline[(w)3] == swap ]] || \ - dev_tmp=( $dev_tmp $mline[(w)1] ) \ - mp_tmp=( $mp_tmp $mline[(w)2] ) - ;; - esac - done < /etc/fstab - - _alternative \ - 'devices:device:compadd -a dev_tmp' \ - 'directories:mount point:compadd -a mp_tmp' && ret=0 - ;; - *) - _alternative \ - 'devices:device:{compadd "$expl[@]" /dev/*}' \ - 'directories:mount point:_files -/' && ret=0 + case "$OSTYPE" in + freebsd*) + while read mline; do + case $mline[(w)1] in + \#* ) + ;; + proc) + ;; + *) + [[ $mline[(w)3] == swap ]] || \ + dev_tmp=( $dev_tmp $mline[(w)1] ) \ + mp_tmp=( $mp_tmp $mline[(w)2] ) + ;; + esac + done < /etc/fstab + + _alternative \ + 'devices:device:compadd -a dev_tmp' \ + 'directories:mount point:compadd -a mp_tmp' && ret=0 ;; - esac - fi + *) + _alternative \ + 'devices:device:_files -P /dev/ -W /dev' \ + 'directories:mount point:_directories' && ret=0 + ;; + esac ;; udevordir) - if (( $+opt_args[-a] )); then - _message "no device or directory with option \`-a'" - else - local dev_tmp mp_tmp mline + local dev_tmp mp_tmp mline - case "$OSTYPE" in - linux*|irix*) - tmp=( "${(@f)$(< /etc/mtab)}" ) - dev_tmp=( "${(@)${(@)tmp%% *}:#none}" ) - mp_tmp=( "${(@)${(@)tmp#* }%% *}" ) - ;; - *) - /sbin/mount | while read mline; do - dev_tmp=( $dev_tmp $mline[(w)1] ) - mp_tmp=( $mp_tmp $mline[(w)3] ) - done - ;; - esac + case "$OSTYPE" in + linux*|irix*) + tmp=( "${(@f)$(< /etc/mtab)}" ) + dev_tmp=( "${(@)${(@)tmp%% *}:#none}" ) + mp_tmp=( "${(@)${(@)tmp#* }%% *}" ) + ;; + *) + /sbin/mount | while read mline; do + mp_tmp=( $mp_tmp $mline[(w)1] ) + dev_tmp=( $dev_tmp $mline[(w)3] ) + done + ;; + esac - _alternative \ - 'devices:device:compadd -a dev_tmp' \ - 'directories:mount point:compadd -a mp_tmp' && ret=0 - fi + _alternative \ + 'devices:device:compadd -a dev_tmp' \ + 'directories:mount point:compadd -a mp_tmp' && ret=0 ;; esac diff --git a/Completion/Unix/Command/_rsync b/Completion/Unix/Command/_rsync index ee05f4841..55fe18d27 100644 --- a/Completion/Unix/Command/_rsync +++ b/Completion/Unix/Command/_rsync @@ -8,15 +8,15 @@ if [[ -prefix *::*/ ]]; then compset -P '*::*/' - remfiles=(${(f)"$(rsync ${words[CURRENT]%/*}/)"}) + remfiles=(${(f)"$(_call_program files rsync ${words[CURRENT]%/*}/)"}) remdispf=(${remfiles:#d*}) remdispd=(${(M)remfiles:#d*}) - _wanted files expl 'remote files and directories' \ + _wanted files expl 'remote file or directory' \ compadd -d remdispf ${remdispf##* } - _wanted files expl 'remote files and directories' \ + _wanted files expl 'remote file or directory' \ compadd -S/ -d remdispd ${remdispd##* } elif [[ -prefix 1 *:: ]]; then @@ -24,7 +24,7 @@ elif [[ -prefix 1 *:: ]]; then compset -P 1 '*::' - remfiles=(${(f)"$(rsync ${words[CURRENT]%::*}::)"}) + remfiles=(${(f)"$(_call_program files rsync ${words[CURRENT]%::*}::)"}) remmodules=(${remfiles/[ ]#/:}) @@ -37,17 +37,17 @@ elif [[ -prefix 1 *: ]]; then if zstyle -T ":completion:${curcontext}:" remote-access; then slash=/ - remfiles=(${(f)"$(ssh -a -x ${words[CURRENT]%:*} ls -d1F ${${${words[CURRENT + remfiles=(${(f)"$(_call_program files ssh -a -x ${words[CURRENT]%:*} ls -d1F ${${${words[CURRENT ]#*:}:h}/${slash}(#e)/}/\* 2>/dev/null)"}) remdispf=(${remfiles:#*/}) remdispd=(${(M)remfiles:#*/}) - _wanted files expl 'remote files and directories' \ - compadd -d remdispf ${${remfiles:#*/}/[*=@|](#e)/} + _wanted files expl 'remote file or directory' \ + compadd -d remdispf ${${remfiles:#*/}/[*=@|](#e)/} - _wanted files expl 'remote files and directories' \ - compadd -S/ -d remdispd ${${(M)remfiles:#*/}/${slash}(#e)/} + _wanted files expl 'remote file or directory' \ + compadd -S/ -d remdispd ${${(M)remfiles:#*/}/${slash}(#e)/} else _message -e remote-files 'remote files' fi @@ -65,14 +65,14 @@ else _wanted users expl "user" \ _combination -s '[:@]' "${tag}" users-hosts users -q "$@" - else - _alternative 'user:users:_users -S @' 'host:hosts:_hosts -S:' + _alternative 'users:user:_users -S @' 'hosts:host:_hosts -S:' fi fi } _rsync_files() { - _alternative "file:files:_files" "remote-files:remote files:_rsync_remote_files" + _alternative "files:file:_files" "remote-files:remote file:_rsync_remote_files" } _arguments -s \ diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion index 4fea4f72e..baccb7c94 100644 --- a/Completion/Unix/Command/_subversion +++ b/Completion/Unix/Command/_subversion @@ -3,15 +3,37 @@ _svn () { _arguments -s \ + '(-)--help[print help information]' \ + '(- *)--version[print client version information]' \ '*::svn command:_svn_command' } _svnadmin () { _arguments -s \ + '(-)--help[print help information]' \ + '(- *)--version[print client version information]' \ '*::svnadmin command:_svnadmin_command' } +(( $+functions[_svn_controlled] )) || +_svn_controlled() { + [[ -f ${(M)REPLY##*/}.svn/text-base/${REPLY##*/}.svn-base ]] +} + +(( $+functions[_svn_urls] )) || +_svn_urls() { + local expl + + if [[ -prefix *: ]]; then + _urls + else + compset -S '[^:]*' + _wanted url-schemas expl 'URL schema' compadd -S '' - \ + file:// http:// https:// svn:// svn+ssh:// + fi +} + (( $+functions[_svn_command] )) || _svn_command () { local cmd @@ -19,12 +41,12 @@ _svn_command () { if (( ! $+_svn_cmds )); then typeset -gA _svn_cmds _svn_cmds=( - ${=${(f)${${"$(svn help)"#l#*Available subcommands:}%%Subversion is a tool*}}/(#s)[[:space:]]#(#b)([a-z]##)[[:space:]]#(\([a-z, ?]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:} + ${=${(f)${${"$(_call_program commands svn help)"#l#*Available subcommands:}%%Subversion is a tool*}}/(#s)[[:space:]]#(#b)([a-z]##)[[:space:]]#(\([a-z, ?]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:} ) fi if (( CURRENT == 1 )); then - _tags commands && { compadd "$@" -k _svn_cmds || compadd "$@" ${_svn_cmds} } + _tags commands && { compadd "$@" -k _svn_cmds || compadd "$@" ${(s.:.)_svn_cmds} } else local curcontext="$curcontext" @@ -42,36 +64,56 @@ _svn_command () { _svn_subcommand () { local subcmd _svn_subcmds _svn_subcmd_usage - _svn_subcmd_usage=${${(M)${(f)"$(svn help $1)"}:#usage:*}#usage: $1 } + _svn_subcmd_usage=${${(M)${(f)"$(_call_program options svn help $1)"}:#usage:*}#usage: $1 } _svn_subcmds=( - ${${=${${${(M)${(f)"$(svn help $1)"##*Valid options:}:#*:*}%% #:*}/ arg/:arg:}/(#b)-([[:alpha:]]) \[--([a-z-]##)\](:arg:)#/(--$match[2])-$match[1]$match[3] (-$match[1])--$match[2]$match[3]}[2,-1]} + ${${=${${${(M)${(f)"$(_call_program options svn help $1)"##*Valid options:}:#*:*}%% #:*}/ arg/:arg:}/(#b)-([[:alpha:]]) \[--([a-z-]##)\](:arg:)#/(--$match[2])-$match[1]$match[3] (-$match[1])--$match[2]$match[3]}[2,-1]} ) - [[ "$_svn_subcmd_usage" == *URL* ]] && _svn_subcmds=($_svn_subcmds ":url:_urls") - [[ "$_svn_subcmd_usage" == *PATH* ]] && _svn_subcmds=($_svn_subcmds "*:path:_files") - - _arguments \ - "$_svn_subcmds[@]" && ret=0 - - return ret - + case $1 in; + add) + _svn_subcmds+=( + '*:file:_files -g "*(^e:_svn_controlled:)"' + ) + ;; + log) + _svn_subcmds+=( + '1: : _alternative "files:file:_files -g \*\(e:_svn_controlled:\)" "urls:url:_svn_urls"' + '*:file:_files -g "*(e:_svn_controlled:)"' + ) + ;; + *) + case $_svn_subcmd_usage in + *(TARGET|URL*PATH)*) + _svn_subcmds+=( + '*: : _alternative "files:file:_files" "urls:url:_svn_urls"' + ) + ;; + *URL*) _svn_subcmds+=( ':url:_svn_urls' ) ;; + *PATH*) _svn_subcmds+=( '*:file:_files' ) ;; + esac + ;; + esac + + _arguments "$_svn_subcmds[@]" && ret=0 + + return ret } -(( $+functions[_svn_admincommand] )) || +(( $+functions[_svnadmin_command] )) || _svnadmin_command () { local cmd if (( ! $+_svnadmin_cmds )); then typeset -gA _svnadmin_cmds _svnadmin_cmds=( - ${=${(f)${${"$(svnadmin help)"#l#*Available subcommands:}}}/(#s)[[:space:]]#(#b)([a-z]##)[[:space:]]#(\([a-z, ?]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:} + ${=${(f)${${"$(_call_program commands svnadmin help)"#l#*Available subcommands:}}}/(#s)[[:space:]]#(#b)([a-z]##)[[:space:]]#(\([a-z, ?]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:} ) fi if (( CURRENT == 1 )); then - _tags commands && { compadd "$@" -k _svnadmin_cmds || compadd "$@" ${(kv)=_svnadmin_cmds} } + _tags commands && { compadd "$@" -k _svnadmin_cmds || compadd "$@" ${(s.:.)_svnadmin_cmds} } else local curcontext="$curcontext" @@ -89,28 +131,27 @@ _svnadmin_command () { _svnadmin_subcommand () { local subcmd _svnadmin_subcmds _svnadmin_subcmd_usage - _svnadmin_subcmd_usage=${${(M)${(f)"$(svnadmin help $1)"}:#$1: usage:*}#$1: usage: svnadmin $1 } + _svnadmin_subcmd_usage=${${(M)${(f)"$(_call_program options svnadmin help $1)"}:#$1: usage:*}#$1: usage: svnadmin $1 } _svnadmin_subcmds=( - ${${=${${${(M)${(f)"$(svnadmin help $1)"##*Valid options:}:#*:*}%% #:*}/ arg/:arg:}/(#b)-([[:alpha:]]) \[--([a-z-]##)\](:arg:)#/(--$match[2])-$match[1]$match[3] (-$match[1])--$match[2]$match[3]}[2,-1]} + ${${=${${${(M)${(f)"$(_call_program options svnadmin help $1)"##*Valid options:}:#*:*}%% #:*}/ arg/:arg:}/(#b)-([[:alpha:]]) \[--([a-z-]##)\](:arg:)#/(--$match[2])-$match[1]$match[3] (-$match[1])--$match[2]$match[3]}[2,-1]} ) [[ "$_svnadmin_subcmd_usage" == *REPOS_PATH* ]] && _svnadmin_subcmds=($_svnadmin_subcmds ":path:_files -/") - _arguments \ - "$_svnadmin_subcmds[@]" && ret=0 + _arguments "$_svnadmin_subcmds[@]" && ret=0 - return ret + return ret } _subversion () { - case $service in - (svn) _svn "$@" ;; - (svnadmin) _svnadmin "$@" ;; - esac + case $service in + (svn) _svn "$@" ;; + (svnadmin) _svnadmin "$@" ;; + esac } _subversion "$@" diff --git a/Completion/Unix/Command/_w3m b/Completion/Unix/Command/_w3m index c37ab920d..1106d5987 100644 --- a/Completion/Unix/Command/_w3m +++ b/Completion/Unix/Command/_w3m @@ -1,6 +1,6 @@ #compdef w3m -local curcontext="$curcontext" state line +local curcontext="$curcontext" state line expl ret=1 typeset -A opt_args _arguments -C \ @@ -9,16 +9,15 @@ _arguments -C \ '-l[preserved lines]:number of lines:' \ '-B[load bookmark]' \ '-bookmark:bookmark file:_files' \ - '-T[content-type]:content type:' \ + '-T[content-type]:content type' \ '-m[internet message mode]' \ '-v[visual startup mode]' \ '-M[monochrome display]' \ '-F[automatically render frame]' \ '(-dump_source -dump_head)-dump' \ - '-cols:column width:' \ + '-cols:column width' \ '(-dump -dump_head)-dump_source' \ '(-dump -dump_source)-dump_head' \ - '+:goto line:' \ '-num[show line number]' \ '-no-proxy' \ '-no-mouse' \ @@ -28,13 +27,25 @@ _arguments -C \ '-S[squeeze multiple blank lines]' \ '-W[toggle wrap search mode]' \ '-X[do not use termcap init/deinit]' \ - '-o[option]:option-value:' \ + '-o[option]:option-value' \ '-config:config file:_files' \ '-debug' \ - ':url:->html' && return 0 + ':url:->html' \ + '+:goto line' && ret=0 -case $state in - html) - _alternative 'files:file:_files -g "*.x#html"' 'urls:url:_w3mhistory' - ;; -esac +if [[ -n $state ]]; then + local w3mhistory + + _tags files w3mhistory urls + while _tags; do + _requested files expl 'file' _files -g "*.x#html" && ret=0 + _requested urls expl 'url' _urls && ret=0 + if [[ -s ~/.w3m/history ]] && _requested w3mhistory; then + w3mhistory=( ${(f)"$(<~/.w3m/history)"} ) + _all_labels w3mhistory expl 'url from history' compadd -a w3mhistory + fi + (( ret )) || break + done +fi + +return ret diff --git a/Completion/Unix/Command/_w3mhistory b/Completion/Unix/Command/_w3mhistory deleted file mode 100644 index f0f944138..000000000 --- a/Completion/Unix/Command/_w3mhistory +++ /dev/null @@ -1,10 +0,0 @@ -#autoload - -local _w3mhistory - -if [[ -s ~/.w3m/history ]]; then - _w3mhistory=(${(f)"$(<$HOME/.w3m/history)"}) - compadd $_w3mhistory -fi - -_urls -f diff --git a/Completion/Unix/Command/_wget b/Completion/Unix/Command/_wget index ccc02d515..33aaa741a 100644 --- a/Completion/Unix/Command/_wget +++ b/Completion/Unix/Command/_wget @@ -17,21 +17,27 @@ _arguments -C -s \ '(--input-file -i)'{--input-file=,-i+}'[specify input file]:file containing URLs:_files' \ '(--force-html -F)'{--force-html,-F}'[treat input file as html]' \ '(--base -B)'{--base=,-B+}'[prepend URL to relative links]:base URL:_urls' \ - '--bind-address=:address to bind to (hostname or IP):_hosts' \ '(--tries -t)'{--tries=,-t+}'[set number of retries]:number of retries' \ + '--retry-connrefused[retry even if connection is refused]' \ '(--output-document -O)'{--output-document=,-O+}'[specify file to write documents to]:output file:_files' \ '(--continue -c)'{--continue,-c}'[continue getting an existing file]' \ '--progress=[set progress gauge type]:gauge type:->gauge' \ '(--timestamping -N)'{--timestamping,-N}'[retrieve only files newer than existing]' \ '(--server-response -S)'{--server-response,-S}'[print server response]' \ "--spider[don't download anything]" \ - '(--timeout -T)'{--timeout=,-T+}'[specify read timeout]:read timeout (seconds)' \ + '(--timeout -T)'{--timeout=,-T+}'[set all timeout values]:timeout (seconds)' \ + '(--timeout -T)--dns-timeout=[set the DNS lookup timeout]:DNS lookup timeout (seconds)' \ + '(--timeout -T)--connect-timeout=[set the connect timeout]:connect timeout (seconds)' \ + '(--timeout -T)--read-timeout=[set the read timeout]:read timeout (seconds)' \ '(--wait,-w)'{--wait=,-w+}'[specify wait between retrievals]:wait between retrievals (seconds)' \ '(--random-wait)--waitretry=:wait between retries of a retrieval (seconds)' \ '(--waitretry)--random-wait[wait from 0...2*WAIT secs between retrievals]' \ '(--proxy -Y)'{--proxy=,-Y+}'[turn proxy on or off]:proxy use:(on off)' \ '(--quota -Q)'{--quota=,-Q+}'[set retrieval quota]:number' \ + '--bind-address=:address to bind to (hostname or IP):_hosts' \ '--limit-rate=[specify limit to download rate]:download rate limit' \ + '--dns-cache=off[disable caching DNS lookups]' \ + '--restrict-file-names=[restrict chars in file names to ones OS allows]:OS:(unix windows)' \ '(--force-directories -x)'{--force-directories,-x}'[force creation of directories]' \ '(--directory-prefix -P)'{--directory-prefix=,-P+}'[specify prefix to save files to]:prefix:_files -/' \ '--cut-dirs=:number:' \ @@ -55,6 +61,7 @@ _arguments -C -s \ '(--backup-converted -K)'{--backup-converted,-K}'[backup files before conversion]' \ '(--mirror -m -r -N -l)'{--mirror,-m}'[mirror (-r -N -l inf -nr)]' \ '(--page-requisites -p)'{--page-requisites,-p}'[get all images needed to display page]' \ + '--strict-comments[turn on strict (SGML) handling of HTML comments]' \ '(--accept -A)'{--accept=,-A+}'[specify accepted extensions]:extensions' \ '(--reject -R)'{--reject=,-R+}'[specify rejected extensions]:extensions' \ '(--domains -D)'{--domains=,-D+}'[specify accepted domains]:domains' \ @@ -79,10 +86,17 @@ _arguments -C -s \ '--cookies=[turn cookies on or off]:cookies:(on off)' \ '--load-cookies=[specify file to load cookies from]:cookie file:_files' \ '--save-cookies=[specify file to save cookies to]:cookie file:_files' \ + '--post-data=[use the POST method with specified data]:data to send' \ + '--post-file=[use the POST method; sending contents of a file]:file:_files' \ '--no-http-keep-alive[disable HTTP keep-alive]' \ '--sslcertfile=[specify client certificate]:client certificate file:_files' \ '--sslcertkey=[specify keyfile for certificate]:keyfile:_files' \ '--egd-file=[specify filename of EGD socket]' \ + "--sslcadir=[specify dir where hash list of CA's are stored]:directory:_directories" \ + "--sslcafile=[specify file with bundle of CA's]:file:_files" \ + '--sslcerttype=[specify client cert type]:certificate type:((0\:PEM 1\:ASN1))' \ + '--sslcheckcert=[check the server cert against given CA]: :(0 1)' \ + '--sslprotocol=[choose SSL protocol]:protocol version:((0\:automatic 1\:SSLv2 2\:SSLv3 3\:TLSv1))' \ '*:url:_urls' && return 0 case "$state" in diff --git a/Completion/Unix/Command/_xmlsoft b/Completion/Unix/Command/_xmlsoft index 647841cfa..e6425cea7 100644 --- a/Completion/Unix/Command/_xmlsoft +++ b/Completion/Unix/Command/_xmlsoft @@ -1,7 +1,7 @@ -#compdef xsltproc xmllint +#compdef xsltproc xmllint -value-,XML_CATALOG_FILES,-default- -# xmllint: using libxml version 20503 -# xsltproc: using libxslt version 10027 +# xmllint: using libxml version 20602 +# xsltproc: using libxslt version 10100 case $service in xsltproc) @@ -16,8 +16,8 @@ case $service in '--novalid[skip the DTD loading phase]' \ '--noout[do not dump the result]' \ '--maxdepth[increase the maximum depth]:depth' \ - '(--docbook)--html[input document is an HTML file]' \ - '(--html)--docbook[input document is SGML docbook]' \ + '--maxparsedepth[increase the maximum parser depth]:depth' \ + '--html[input document is an HTML file]' \ '--param[pass a parameter,value pair]:name::value (xpath expression)' \ '--stringparam[pass a parameter]:name::value' \ '--path[provide a set of paths for resources]:paths:_files -/' \ @@ -27,6 +27,7 @@ case $service in '--writesubtree[allow file write only with the path subtree]:path:_files -/' \ '--catalogs[use SGML catalogs]' \ '--xinclude[do XInclude processing on document input]' \ + '--load-trace[print trace of all external entites loaded]' \ {--profile,--norman}'[dump profiling information]' \ '1:stylesheet:_files -g \*.xsl' \ ':file:_files -g \*.xml' && return @@ -65,34 +66,51 @@ case $service in '--htmlout[output results as HTML]' \ '--nowrap[do not put HTML doc wrapper]' \ '--valid[validate the document in addition to std well-formed check]' \ - '(--dtdvalid --relaxng)--postvalid[do a posteriori validation, i.e after parsing]' \ - '(--postvalid --relaxng)--dtdvalid[do a posteriori validation against a given DTD]:DTD:_webbrowser' \ + '(--dtdvalid --relaxng --schema)--postvalid[do a posteriori validation, i.e after parsing]' \ + '(--postvalid --relaxng --schema --dtdvalidfpi)--dtdvalid[do a posteriori validation against a given DTD]:DTD:_webbrowser' \ + '(--postvalid --relaxng --schema --dtdvalid)--dtdvalidfpi[as --dtdvalid but specify DTD with public identifier]:DTD identifier' \ '--timing[print some timings]' \ '(--noout --output -o)'{--output,-o}'[save to a given file]:output file:_files' \ '--repeat[repeat 100 times, for timing or profiling]' \ '--insert[ad-hoc test for valid insertions]' \ '--compress[turn on gzip compression of output]' \ - '(--html)--sgml[use the DocBook SGML parser]' \ - '(--sgml)--html[use the HTML parser]' \ + '--html[use the HTML parser]' \ + '--xmlout[use the XML serializer when using --html]' \ '--push[use the push mode of the parser]' \ '--memory[parse from memory]' \ '--nowarning[do not emit warnings from parser/validator]' \ '--noblanks[drop (ignorable?) blanks spaces]' \ + '--nocdata[replace cdata section with text nodes]' \ '--format[reformat/reindent the input]' \ - '--testIO[test user I/O support]' \ '--encode[output in the given encoding]:encoding:(${encoding[@]})' \ + '--dropdtd[remove the DOCTYPE of the input docs]' \ + '--nsclean[remove redundant namespace declarations]' \ + '--testIO[test user I/O support]' \ '(--nocatalogs)--catalogs[use SGML catalogs]' \ '(--catalogs)--nocatalogs[deactivate all catalogs]' \ '--auto[generate a small doc on the fly]' \ '--xinclude[do XInclude processing]' \ '--loaddtd[fetch external DTD]' \ '--dtdattr[loaddtd + populate the tree with inherited attributes]' \ - '--dropdtd[remove the DOCTYPE of the input docs]' \ '--stream[use the streaming interface to process very large files]' \ + '--walker[create a reader and walk though the resulting doc]' \ '--chkregister[verify the node registration code]' \ - '(--dtdvalid --postvalid)--relaxng[do RelaxNG validation against the schema]:schema:_webbrowser' \ + '(--dtdvalid --postvalid --schema)--relaxng[do RelaxNG validation against specified schema]:schema:_webbrowser' \ + '(--dtdvalid --postvalid --relaxng)--schema[do validation against specified WXS schema]:schema:_webbrowser' \ '*:XML file:_webbrowser' && return ;; + *XML_CATALOG_FILES*) + compset -q + if [[ -prefix *: ]]; then + _urls + return + fi + + compset -S ':*' + _alternative \ + 'files:catalog file:_files' \ + 'url-schemas:URL schema:compadd -S "" file:///' && return + ;; esac return 1 diff --git a/Completion/Unix/Type/_diff_options b/Completion/Unix/Type/_diff_options index a88b4780a..643868f20 100644 --- a/Completion/Unix/Type/_diff_options +++ b/Completion/Unix/Type/_diff_options @@ -1,6 +1,7 @@ #autoload local of ofwuc ouc oss ofwy ofwg ofwl cmd +local -a args cmd="$1" shift @@ -10,12 +11,13 @@ if _pick_variant -c $cmd gnu=GNU unix -v; then of="-y --side-by-side -n --rcs -e -f --ed -q --brief -c -C --context -u -U \ --unified --old-group-format --new-group-format --changed-group-format \ --unchanged-group-format --line-format --old-line-format --new-line-format \ - --unchanged-line-format --normal" + --unchanged-line-format --normal -D --ifdef" # output formats w/o unified and context ofwuc="-y --side-by-side -n --rcs -e -f --ed -q --brief --old-group-format \ --new-group-format --changed-group-format --unchanged-group-format --normal \ - --line-format --old-line-format --new-line-format --unchanged-line-format" + --line-format --old-line-format --new-line-format --unchanged-line-format \ + -D --ifdef" # option specific to unified or context diff ouc='-L --label -p --show-c-function -F --show-function-line' @@ -27,11 +29,12 @@ if _pick_variant -c $cmd gnu=GNU unix -v; then ofwy="-n --rcs -e -f --ed -q --brief -c -C --context -u -U --unified \ --old-group-format --new-group-format --changed-group-format \ --unchanged-group-format --line-format --old-line-format \ - --new-line-format --unchanged-line-format --normal" + --new-line-format --unchanged-line-format --normal -D --ifdef" # output formats w/o group format ofwg="-n --rcs -e -f --ed -q --brief -c -C --context -u -U --unified --normal \ - --line-format --old-line-format --new-line-format --unchanged-line-format" + --line-format --old-line-format --new-line-format --unchanged-line-format + -D --ifdef" # output formats w/o line format ofwl="-n --rcs -e -f --ed -q --brief -c -C --context -u -U --unified \ @@ -39,30 +42,24 @@ if _pick_variant -c $cmd gnu=GNU unix -v; then --unchanged-group-format" _arguments -s \ - '(--ignore-case -i)'{--ignore-case,-i}'[case insensitive]' \ - '--ignore-file-name-case[ignore case when comparing file names]' \ - '--no-ignore-file-name-case[consider case when comparing file names]' \ - '(--ignore-tab-expansion -E)'{--ignore-tab-expansion,-E}'[ignore changes due to tab expansion]' \ - '(-b)--ignore-space-change[ignore changes in the amount of white space]' \ + '(-i --ignore-case)'{-i,--ignore-case}'[case insensitive]' \ + '(--no-ignore-file-name-case)--ignore-file-name-case[ignore case when comparing file names]' \ + '(--ignore-file-name-case)--no-ignore-file-name-case[consider case when comparing file names]' \ + '(-E --ignore-tab-expansion)'{-E,--ignore-tab-expansion}'[ignore changes due to tab expansion]' \ + '(-b --ignore-space-change)'{-b,--ignore-space-change}'[ignore changes in the amount of white space]' \ '(--ignore-space-change)-b[ignore changes in the amount of white space]' \ '(--ignore-all-space -w)'{--ignore-all-space,-w}'[ignore all white space]' \ - '(-B)--ignore-blank-lines[ignore lines that are all blank]' \ - '(--ignore-blank-lines)-B[ignore lines that are all blank]' \ - '(--ignore-matching-lines -I)'{--ignore-matching-lines=,-I+}'[ignore lines that match regex]:line exclusion regex:' \ + '(-B --ignore-blank-lines)'{-B,--ignore-blank-lines}'[ignore lines that are all blank]' \ + '(-I --ignore-matching-lines)'{-I+,--ignore-matching-lines=}'[ignore lines that match regex]:line exclusion regex:' \ '--strip-trailing-cr[strip trailing carriage return on input]' \ - '(--text -a)'{--text,-a}'[treat all files as text]' \ - "($of $oss)--context=-[output a context diff]:number of lines of copied context:" \ - "($of $oss)-C+[output a context diff]:number of lines of copied context:" \ + '(-a --text)'{-a,--text}'[treat all files as text]' \ + "($of $oss)"{-C+,--context=-}'[output a context diff]:number of lines of copied context' \ "($of $oss)-c[output a context diff]" \ - "($of $oss)--unified=-[output a unified diff]:number of lines of unified context:" \ - "($of $oss)-U+[output a unified diff]:number of lines of unified context:" \ + "($of $oss)"{-U+,-unified=-}'[output a unified diff]:number of lines of unified context' \ "($of $oss)-u[output a unified diff]" \ - "($ofwuc $oss)*--label=[set label to use instead of file name]:label:" \ - "($ofwuc $oss)*-L+[set label to use instead of file name]:label:" \ - "($ofwuc $oss -p)--show-c-function[show C function of each change]" \ - "($ofwuc $oss --show-c-function)-p[show C function of each change]" \ - "($ofwuc $oss -F)--show-function-line=[show the most recent line matching regex]:regex:" \ - "($ofwuc $oss --show-function-line)-F+[show the most recent line matching regex]:regex:" \ + "($ofwuc $oss)*"{-L+,--label=}'[set label to use instead of file name]:label' \ + "($ofwuc $oss -p --show-c-function)"{-p,--show-c-function}'[show C function of each change]' \ + "($ofwuc $oss -F --show-function-line)"{-F+,--show-function-line=}'[show the most recent line matching regex]:regex' \ "($of $ouc $oss)--brief[output only whether files differ]" \ "($of $ouc $oss)-q[output only whether files differ]" \ "($of $ouc $oss -e --ed)"{--ed,-e}'[output an ed script]' \ @@ -73,45 +70,62 @@ if _pick_variant -c $cmd gnu=GNU unix -v; then "($of $ouc $oss)-n[RCS format diff]" \ "($of $ouc)--side-by-side[output in two columns]" \ "($of $ouc)-y[output in two columns]" \ - "($ofwy $ouc --width -W)"{--width=,-W+}'[set size of line]:number of characters per line:' \ + "($ofwy $ouc --width -W)"{--width=,-W+}'[set size of line]:number of characters per line' \ "($ofwy $ouc)--left-column[output only left column of common lines]" \ "($ofwy $ouc)--suppress-common-lines[do not output common lines]" \ - "($ofwg $ouc $oss)--old-group-format=[set old group format]:old group format:" \ - "($ofwg $ouc $oss)--new-group-format=[set new group format]:new group format:" \ - "($ofwg $ouc $oss)--changed-group-format=[set changed group format]:changed group format:" \ - "($ofwg $ouc $oss)--unchanged-group-format=[set unchanged group format]:unchanged group format:" \ - "($ofwl $ouc $oss)--line-format=[set line format]:line format:" \ - "($ofwl $ouc $oss)--old-line-format=[set old line format]:old line format:" \ - "($ofwl $ouc $oss)--new-line-format=[set new line format]:new line format:" \ - "($ofwl $ouc $oss)--unchanged-line-format=[set unchanged line format]:unchanged line format:" \ - '(--paginate -l)'{--paginate,-l}'[output through pr]' \ - '(--expand-tabs -t)'{--expand-tabs,-t}'[expand tabs to spaces]' \ - '(--initial-tab -T)'{--initial-tab,-T}'[prepend a tab]' \ - '(--recursive -r)'{--recursive,-r}'[recursively compare subdirectories]' \ - '(--new-file -N)'{--new-file,-N}'[treat absent files as empty]' \ - '(-P)--unidirectional-new-file[treat absent first files as empty]' \ - '(--unidirectional-new-file)-P[treat absent first files as empty]' \ - '(-s)--report-identical-files[report when two files are the same]' \ - '(--report-identical-files)-s[report when two files are the same]' \ - '(-x)--exclude=[exclude files matching pattern]:exclusion pattern:' \ - '(--exclude)-x+[exclude files matching pattern]:exclusion pattern:' \ - '(-X)--exclude-from=[exclude files matching pattern in file]:exclude file:_files' \ - '(--exclude-from)-X+[exclude files matching pattern in file]:exclude file:_files' \ - '(-S)--starting-file=[set first file in comparison]:start with file:_files' \ - '(--starting-file)-S+[set first file in comparison]:start with file:_files' \ + "($of $oss)"{-D,--ifdef=}'[output merged file with preprocessor directives]:preprocessor symbol' \ + "($ofwg $ouc $oss)--old-group-format=[set old group format]:old group format" \ + "($ofwg $ouc $oss)--new-group-format=[set new group format]:new group format" \ + "($ofwg $ouc $oss)--changed-group-format=[set changed group format]:changed group format" \ + "($ofwg $ouc $oss)--unchanged-group-format=[set unchanged group format]:unchanged group format" \ + "($ofwl $ouc $oss)--line-format=[set line format]:line format" \ + "($ofwl $ouc $oss)--old-line-format=[set old line format]:old line format" \ + "($ofwl $ouc $oss)--new-line-format=[set new line format]:new line format" \ + "($ofwl $ouc $oss)--unchanged-line-format=[set unchanged line format]:unchanged line format" \ + '(-l --paginate)'{-l,--paginate}'[output through pr]' \ + '(-t --expand-tabs)'{-t,--expand-tabs}'[expand tabs to spaces]' \ + '(-T --initial-tab)'{-T,--initial-tab}'[prepend a tab]' \ + '--tabsize=[specify width of tab]:width' \ + '(-r --recursive)'{-r,--recursive}'[recursively compare subdirectories]' \ + '(-N --new-file)'{-N,--new-file}'[treat absent files as empty]' \ + '(-P --unidirectional-new-file)'{-P,--unidirectional-new-file}'[treat absent first files as empty]' \ + '(-s --report-identical-files)'{-s,--report-identical-files}'[report when two files are the same]' \ + '(-x --exclude)'{-x+,--exclude=}'[exclude files matching pattern]:exclusion pattern' \ + '(-X --exclude-from)'{-X+,--exclude-from=}'[exclude files matching pattern in file]:exclude file:_files' \ + '(-S --starting-file)'{-S+,--starting-file=}'[set first file in comparison]:start with file:_files' \ '(--to-file)--from-file=[compare specified file to all operands]:from file:_files' \ '(--from-file)--to-file=[compare all operands to specified file]:to file:_files' \ - '--horizon-lines=[set number of lines to keep in prefix and suffix]:number of horizon lines:' \ - '(--minimal -d)'{--minimal,-d}'[try to find a smaller set of changes]' \ - '(--speed-large-files -H)'{--speed-large-files,-H}'[assume large files and many small changes]' \ - '(--version -v)'{--version,-v}'[output version info]' \ - '--help[help text]' \ + '--horizon-lines=[set number of lines to keep in prefix and suffix]:number of horizon lines' \ + '(-d --minimal)'{-d,--minimal}'[try to find a smaller set of changes]' \ + '(-H --speed-large-files)'{-H,--speed-large-files}'[assume large files and many small changes]' \ + '(-v --version)'{-v,--version}'[display version info]' \ + '--help[display help info]' \ "$@" else - _arguments \ - "(-e -f)-c[output a context diff]" \ - "(-c -f)-e[output an ed script]" \ - "(-c -e)-f[output a reversed ed script]" \ + case $OSTYPE in + solaris2.9) + args=( '(-c -e -f -C)-u[output a unified diff]' ) + ;& + solaris*) + args+=( + '-i[case insensitive]' + '-t[expand tabs to spaces]' + '-w[ignore all white space]' + '(-c -e -f -n -u -h -D)-C+[output a context diff]:number of lines of copied context' + '(-c -e -f -n -u -C -D)-h[do a fast, half-hearted job]' + '(-c -e -f -u -h -C -D)-n[reversed ed script]' + '(-c -e -f -n -u -h -C)-D[output merged file with preprocessor directives]:preprocessor symbol' + '-l[output through pr]' + '-s[report on identical files]' + '-S+[set first file in comparison]:start with file:_files' + ) + ;; + esac + + _arguments "$args[@]" \ + "(-e -f -u -n)-c[output a context diff]" \ + "(-c -f -u -n)-e[output an ed script]" \ + "(-c -e -u -n)-f[output a reversed ed script]" \ '-b[skip trailing white spaces]' \ '-r[recursively compare subdirectories]' \ "$@" diff --git a/Completion/Zsh/Command/_alias b/Completion/Zsh/Command/_alias index 8b28f470a..c7b67c40a 100644 --- a/Completion/Zsh/Command/_alias +++ b/Completion/Zsh/Command/_alias @@ -1,6 +1,6 @@ #compdef alias -local curcontext="$curcontext" state line type suf +local curcontext="$curcontext" state line expl type suf typeset -A opt_args _arguments -C -s -A "-*" -S \ diff --git a/Completion/Zsh/Command/_precommand b/Completion/Zsh/Command/_precommand index e48094721..075f086a9 100644 --- a/Completion/Zsh/Command/_precommand +++ b/Completion/Zsh/Command/_precommand @@ -1,4 +1,4 @@ -#compdef - nohup eval time rusage noglob nocorrect exec +#compdef - nohup env eval time rusage noglob nocorrect exec shift words (( CURRENT-- )) |