From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13384 invoked by alias); 7 Jan 2018 04:35:46 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 42240 Received: (qmail 19419 invoked by uid 1010); 7 Jan 2018 04:35:46 -0000 X-Qmail-Scanner-Diagnostics: from mail-oi0-f53.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(209.85.218.53):SA:0(-1.7/5.0):. Processed in 3.61381 secs); 07 Jan 2018 04:35:46 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_PASS,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.1 X-Envelope-From: phy1729@gmail.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mail-followup-to:mime-version :content-disposition:user-agent; bh=NZHMT/eJa0l333eRItUpsCmieir5f16hUUu4dsSGFPI=; b=dAlYj5jRzSL4jtziWhdu32BhIpKGAdC38LMHgnuUlzxLNc1UsKt6Z8TdpOciQQYcrz SKz8bDk34XbJTasWx2ZbtKzamlxEDAzLzHfQ61WBwuZFql48n0TONIGbdOHz+f0rFjL9 F5QL7Nzadks7wS6GjW8PnLpnTzGztv80H/JX6YFmaDfAHxueQmTN67Bzu/4QGQPdOVE0 /pCdt9/Ov5qIxlgdNh7yNaDC3093f78g6y0WJMrhoF76NJwvJfSLcLymvUiyrgINN+wL 9oog9Pv2OnQfEzhFlV6ElDIDgtUPsfoSK6EundiMAov1nHZ+K4NbkY06LpWdv/EMaduV wgGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mail-followup-to :mime-version:content-disposition:user-agent; bh=NZHMT/eJa0l333eRItUpsCmieir5f16hUUu4dsSGFPI=; b=Lo3nZit4wQcSBE5o3YyzuqHyxa2RsJSN4hMm7EIg6EmxPhMVDFO4TU1A/KTDrMn5s2 8hu4wBZQezYfVn9pgLo5quMYYJ7gysWLUGF/1t8+9SoUk+So8shJcdreAcrIfb/s+bNh iPRG4JwrXUjUVYUykEINMsdp7e3ra1Gr93hOXgbrUckw5hRJo1YXUjl2cp381+2s20KE J907XUo2RL7YoIrHRFwGDxUls6rv+Zg42adA8l6ywe6wDepWM34afXpI3atulJOc6w0v mz9yNizaihyB2A+4zKa6hnMiA+OfisIav3CkI6oV6rc09rC5wDeXKZdwhT3d1xMw9Wx/ miVw== X-Gm-Message-State: AKGB3mJAXQb0C8U+fBFg3kY8DOzhcSeTtFT3wHRPonRtuK+NNrHf34Wv /CBlSQ0Qsqkpf2z1FkTKF0IJiSXm X-Google-Smtp-Source: ACJfBot4vgL1r7PTCWtP3bbg3VsjaaUooZfLgaFJ0H70b/6aDOqjthRizzK9KGwdrsTg0RLyRwKegg== X-Received: by 10.202.197.23 with SMTP id v23mr3722990oif.207.1515299738697; Sat, 06 Jan 2018 20:35:38 -0800 (PST) Date: Sat, 6 Jan 2018 22:35:36 -0600 From: Matthew Martin To: zsh-workers@zsh.org Subject: [patch] Add BSDs to _ldconfig Message-ID: <20180107043536.GA58441@CptOrmolo.darkstar> Mail-Followup-To: zsh-workers@zsh.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.9.2 (2017-12-15) Move _ldconfig to Unix and add [DFNO]BSD to the mix. Thanks to Dana for review. - Matthew Martin diff --git a/Completion/Linux/Command/_ldconfig b/Completion/Linux/Command/_ldconfig deleted file mode 100644 index 5f4802f91..000000000 --- a/Completion/Linux/Command/_ldconfig +++ /dev/null @@ -1,35 +0,0 @@ -#compdef ldconfig ldconfig.real - -local ret=1 -local -a context line state state_descr -local -A opt_args - -_arguments -s -S : \ - '(x -v --verbose)'{-v,--verbose}'[output verbosely]' \ - '(x)*: :->files' \ - + x \ - '(: -)'{-\?,--help}'[display help information]' \ - '(: -)'{-p,--print-cache}'[display libraries in current cache]' \ - '(: -)--usage[display brief usage information]' \ - '(: -)'{-V,--version}'[display version information]' \ - + l \ - '(x o)-l[manually link individual libraries (library mode)]' \ - + o \ - '(x l -c --format)'{-c+,--format=}'[specify cache format]:cache format:(old new compat)' \ - '(x l)-C+[specify cache file to use instead of /etc/ld.so.cache]:cache file:_files' \ - '(x l)-f+[specify configuration file to use instead of /etc/ld.so.conf]:configuration file:_files' \ - '(x l -i --ignore-aux-cache)'{-i,--ignore-aux-cache}'[ignore auxiliary cache file]' \ - '(x l -N)-n[process only directories specified on command line (implies -N)]' \ - '(x l)-N[do not rebuild cache]' \ - '(x l)-r+[specify root directory]:root directory:_directories' \ - '(x l)-X[do not update symbolic links]' \ -&& ret=0 - -[[ $state == files ]] && -if [[ -n ${opt_args[(I)l--l]} ]]; then - _object_files && ret=0 -else - _directories && ret=0 -fi - -return ret diff --git a/Completion/Unix/Command/_ldconfig b/Completion/Unix/Command/_ldconfig new file mode 100644 index 000000000..d9f0b5eac --- /dev/null +++ b/Completion/Unix/Command/_ldconfig @@ -0,0 +1,82 @@ +#compdef ldconfig ldconfig.real + +local ret=1 +local -a args context line state state_descr +local -A opt_args + +case $OSTYPE in + linux*) + args=( + '(x -v --verbose)'{-v,--verbose}'[output verbosely]' \ + + x \ + '(: -)'{-\?,--help}'[display help information]' + '(: -)'{-p,--print-cache}'[display libraries in current cache]' + '(: -)--usage[display brief usage information]' + '(: -)'{-V,--version}'[display version information]' + + l + '(x o)-l[manually link individual libraries (library mode)]' + + o + '(x l -c --format)'{-c+,--format=}'[specify cache format]:cache format:(old new compat)' + '(x l)-C+[specify cache file to use instead of /etc/ld.so.cache]:cache file:_files' + '(x l)-f+[specify configuration file to use instead of /etc/ld.so.conf]:configuration file:_files' + '(x l -i --ignore-aux-cache)'{-i,--ignore-aux-cache}'[ignore auxiliary cache file]' + '(x l -N)-n[process only directories specified on command line (implies -N)]' + '(x l)-N[do not rebuild cache]' + '(x l)-r+[specify root directory]:root directory:_directories' + '(x l)-X[do not update symbolic links]' + ) + ;; + *bsd*|dragonfly*) + args=( + '(-U)-m[merge into the existing hints file]' + '(: -)-r[list the current contents of the hints file]' + );| + dragonfly*|freebsd*|openbsd*) + args+=( + '(-U)-R[rescan previously configured directories]' + );| + dragonfly*|freebsd*) + args+=( + '(-aout)-elf[generate hints for elf format shared libraries]' + '-f+[specify hints file]:hints file:_files' + '-i[run in insecure mode]' + );| + freebsd*|netbsd*|openbsd*) + args+=( + '-v[switch on verbose mode]' + );| + freebsd*|openbsd*) + args+=( + '-s[do not scan /usr/lib for shared libraries]' + '-v[switch on verbose mode]' + );| + freebsd*) + args+=( + '-32[generate hints for 32-bit ABI shared libraries]' + '(-elf)-aout[generate hints for a.out format shared libraries]' + );| + netbsd*) + args+=( + '(-s)-c[do not scan directories in /etc/ls.so.conf]' + '(-s)-S[do not scan /usr/lib for shared libraries]' + '-s[do not scan /usr/lib or directories in /etc/ld.so.conf for shared libraries]' + );| + openbsd*) + args+=( + '(-m)-U[unconfigure specified directories or inaccessable directories if none specified]' + );| +esac + +_arguments -s -S : \ + '(x)*: :->files' \ + $args \ +&& ret=0 + +[[ $state == files ]] && +if [[ -n ${opt_args[(I)l--l]} ]]; then + _object_files && ret=0 +else + _directories && ret=0 +fi + +return ret