From 3f8decaf7d178c90ef6277a749f1b721f383e65b Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@users.sourceforge.net>
Date: Sun, 11 Nov 2012 22:18:16 +0000
Subject: 30793: account for eglibc in _pick_variant patterns

---
 Completion/Unix/Command/_getent | 3 ++-
 Completion/Unix/Command/_iconv  | 4 ++--
 Completion/Unix/Command/_ldd    | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'Completion/Unix')

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
-- 
cgit 1.4.1