From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-37381-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 3034 invoked by alias); 11 Dec 2015 06:44:47 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 37381
Received: (qmail 28374 invoked from network); 11 Dec 2015 06:44:45 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM,
	T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no
	version=3.4.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=date:from:to:subject:message-id:mime-version:content-type
         :content-disposition:user-agent;
        bh=fENlU14gq8G4MDx9OBvH/tHNYXr67m7Pp3r9n2iVRCw=;
        b=QH6ut7PiBp5AnB5HVwB0dElyVAjYIra9vhY/15eaV6ZaqirFNWCo6jFKIBv7SOeggI
         D3lPloj8FQZbqbRHOLILPW5iVEcqEovyv+9KjbveRbpGJOzAAtYrpi1gMrye0dP6mc1F
         flEvW9s8bab1kZgJW0QLFmlpAiJb+kY7zlGxBDmlpp5cmUsHzCz68s86FM8GFv5Yi0gg
         yrci9TyWB+K41SA3AmPLgxH813ktHUH6Y+Bxcz2gQmKHYgWnnkLDDkBXTNUxyD5y/yw2
         Gz+vkX1TFWA63NzJWvVL/8JDbXyy3KLUCVVPV47rfEjJ0wpKK0TPxXt575UTa+vkhjYY
         sYGw==
X-Received: by 10.202.74.69 with SMTP id x66mr12354096oia.96.1449816282423;
        Thu, 10 Dec 2015 22:44:42 -0800 (PST)
Date: Fri, 11 Dec 2015 00:44:41 -0600
From: Matthew Martin <phy1729@gmail.com>
To: zsh-workers@zsh.org
Subject: [patch] Add _elf_files type
Message-ID: <20151211064440.GA19567@CptOrmolo.darkstar>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.24 (2015-08-30)

elfdump, nm, objdump, and readelf all had a similar way of determining
what files they would complete. Move this into _elf_files. Also adds
patterns for core files and versioned libraries. 

- Matthew Martin


diff --git a/Completion/Unix/Command/_elfdump b/Completion/Unix/Command/_elfdump
index ee92402..4670d75 100644
--- a/Completion/Unix/Command/_elfdump
+++ b/Completion/Unix/Command/_elfdump
@@ -2,10 +2,6 @@
 
 local -a args
 
-_elf_file() {
-  [[ -x $REPLY || $REPLY = (core*|*.([ao]|so|elf)) ]]
-}
-
 args=(
   '-c[dump section header information]'
   '-d[dump .dynamic section]'
@@ -38,7 +34,7 @@ case $OSTYPE in
       '-l[show long section names without truncation]'
       '-O[specify osabi to apply]:osabi'
       '-P[use alternative section header]'
-      "*:elf file:_files -g '*(-.e:_elf_file:)'"
+      "*:elf file:_elf_files"
     )
   ;;
   freebsd*) args+=( '-a[dump all information]' ) ;;
diff --git a/Completion/Unix/Command/_nm b/Completion/Unix/Command/_nm
index d171ef5..df5f1eb 100644
--- a/Completion/Unix/Command/_nm
+++ b/Completion/Unix/Command/_nm
@@ -2,11 +2,7 @@
 
 local args files variant
 
-_nm_object_file() {
-  [[ -x $REPLY || $REPLY = *.([ao]|so|elf) ]]
-}
-
-files="*:object file:_files -g '*(-.e,_nm_object_file,)'"
+files="*:object file:_elf_files"
 args=(
   '(-A -o --print-file-name)'{-A,-o,--print-file-name}'[print name of input file on each line]'
   '(--demangle)-C[decode symbol names]'
diff --git a/Completion/Unix/Command/_objdump b/Completion/Unix/Command/_objdump
index 607719a..b092df4 100644
--- a/Completion/Unix/Command/_objdump
+++ b/Completion/Unix/Command/_objdump
@@ -1,8 +1,3 @@
 #compdef objdump
 
-# borrowed from _nm_object_file
-_objdump_object_file() {
-  [[ -x $REPLY || $REPLY = *.([ao]|so|elf) ]]
-}
-
-_arguments -- '*:object file:_files -g "*(-.e,_objdump_object_file,)"'
+_arguments -- '*:object file:_elf_files'
diff --git a/Completion/Unix/Command/_readelf b/Completion/Unix/Command/_readelf
index 9312ea8..b3a24c8 100644
--- a/Completion/Unix/Command/_readelf
+++ b/Completion/Unix/Command/_readelf
@@ -2,10 +2,6 @@
 
 local variant args sections
 
-_elf_file() {
-  [[ -x $REPLY || $REPLY = (core*|*.([ao]|so|elf)) ]]
-}
-
 sections=( .bss .data .dynamic .dynsym .got .interp .shstrtab .symtab .text )
 _pick_variant -r variant elftoolchain=elftoolchain elfutils=elfutils binutils --version
 
@@ -29,7 +25,7 @@ args=(
   '(-W --wide)'{-W,--wide}'[allow output width to exceed 80 characters]'
   '(- *)'{-H,--help}'[display help information]'
   '(- *)'{-v,--version}'[display version information]'
-  "*:elf file:_files -g '*(-.e:_elf_file:)'"
+  "*:elf file:_elf_files"
 )
 
 case $variant in
diff --git a/Completion/Unix/Type/_elf_files b/Completion/Unix/Type/_elf_files
new file mode 100644
index 0000000..68b2fbc
--- /dev/null
+++ b/Completion/Unix/Type/_elf_files
@@ -0,0 +1,13 @@
+#autoload
+
+local expl
+
+_description files expl 'elf object file'
+
+__object_file() {
+  [[ -x $REPLY || $REPLY = *.([ao]|so|elf)(.<->)## ]] ||
+    [[ $OSTYPE = linux* && $REPLY = core.* ]] ||
+    [[ $OSTYPE = openbsd* && $REPLY = *.core ]]
+}
+
+_files -g '*(-.e,__object_file,)'