diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | Completion/Unix/Command/_getent | 3 | ||||
| -rw-r--r-- | Completion/Unix/Command/_iconv | 4 | ||||
| -rw-r--r-- | Completion/Unix/Command/_ldd | 4 |
4 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index aa5473e4d..ace71f6ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-11-11 Oliver Kiddle <opk@zsh.org> + + * 30793: Completion/Unix/Command/_getent, + Completion/Unix/Command/_iconv, Completion/Unix/Command/_ldd: + account for eglibc in _pick_variant patterns + 2012-11-08 Bart Schaefer <schaefer@zsh.org> * 30786: Src/builtin.c: do not enter interactive history editing @@ -316,5 +322,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5756 $ +* $Revision: 1.5757 $ ***************************************************** diff --git a/Completion/Unix/Command/_getent b/Completion/Unix/Command/_getent index 9644fa35b..3ea148b71 100755 --- a/Completion/Unix/Command/_getent +++ b/Completion/Unix/Command/_getent @@ -5,12 +5,13 @@ local services databases keys local -a args typeset -A opt_args -if _pick_variant -r is_gnu gnu=GNU unix --version; then +if _pick_variant -r is_gnu gnu='(GNU|EGLIBC)' unix --version; then args+=( '(- 1 *)'{-\?,--help}'[display help information]' '(- 1 *)--usage[display a short usage message]' '(- 1 *)'{-V,--version}'[display version information]' {-s,--service=}'[specify service configuration to use]:service:->services' + '(-i --no-idn)'{-i,--no-idn}'[disable IDN encoding]' ) fi diff --git a/Completion/Unix/Command/_iconv b/Completion/Unix/Command/_iconv index 75fe521ee..190ed5f77 100644 --- a/Completion/Unix/Command/_iconv +++ b/Completion/Unix/Command/_iconv @@ -4,13 +4,13 @@ local expl curcontext="$curcontext" state line ret=1 local LOCPATH="${LOCPATH:-/usr/lib/nls/loc}" local -U codeset -if _pick_variant gnu=GNU unix --version; then +if _pick_variant gnu='(GNU|EGLIBC)' unix --version; then local exargs="--list -? --help --usage --version -V" _arguments -C -S -s \ "(-f --from-code $exargs)"{-f+,--from-code=}'[specify code set of input file]:code set:->codeset' \ "(-t --to-code $exargs)"{-t+,--to-code=}'[specify code set for output]:code set:->codeset' \ - '(- 1)--list[list all character code sets]' \ + '(- 1 -l --list)'{-l,--list}'[list all character code sets]' \ "($exargs)-c[omit invalid characters from output]" \ "(-o --output $exargs)"{-o+,--output=}'[specify output file]:output file:_files' \ "(-s --silent --verbose $exargs)"{-s,--silent}'[suppress warnings]' \ diff --git a/Completion/Unix/Command/_ldd b/Completion/Unix/Command/_ldd index d59294717..0980bc043 100644 --- a/Completion/Unix/Command/_ldd +++ b/Completion/Unix/Command/_ldd @@ -1,12 +1,12 @@ #compdef ldd -if _pick_variant gnu=GNU solaris --version; then +if _pick_variant gnu='(GNU|EGLIBC)' solaris --version; then args=( '(- *)--version[display version information]' '(- *)--help[display help information]' '(-v --verbose)'{-v,--verbose}'[include symbol versioning information]' '(-d --data-relocs)'{-d,--data-relocs}'[perform data relocations and report missing objects]' - '(-f --function-relocs)'{-f,--function-relocs}'[perform data/function relocations and report missing objects]' + '(-r --function-relocs)'{-r,--function-relocs}'[perform data/function relocations and report missing objects]' '(-u --unused)'{-u,--unused}'[display any unused objects]' ) else |