* [patch] Add _elf_files type
@ 2015-12-11 6:44 Matthew Martin
2015-12-11 7:21 ` Oliver Kiddle
0 siblings, 1 reply; 3+ messages in thread
From: Matthew Martin @ 2015-12-11 6:44 UTC (permalink / raw)
To: zsh-workers
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,)'
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch] Add _elf_files type
2015-12-11 6:44 [patch] Add _elf_files type Matthew Martin
@ 2015-12-11 7:21 ` Oliver Kiddle
2015-12-11 7:52 ` Matthew Martin
0 siblings, 1 reply; 3+ messages in thread
From: Oliver Kiddle @ 2015-12-11 7:21 UTC (permalink / raw)
To: zsh-workers
Matthew Martin wrote:
> 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.
This seems sensible.
Don't some systems including even Mac OS X use something other than ELF?
With that in mind, should it perhaps be named _object_files?
Also, can we perhaps be a little more generous on matching core files?
On Linux it is configurable via /proc/sys/kernel/core_pattern, similarly
on Solaris via coreadm(1M) and FreeBSD via the sysctl variable
kern.corefile.
While the defaults for those systems are core.pid, core and cmd.core,
respectively, I'd be inclined to match (core*|*.core) on any system.
Oliver
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch] Add _elf_files type
2015-12-11 7:21 ` Oliver Kiddle
@ 2015-12-11 7:52 ` Matthew Martin
0 siblings, 0 replies; 3+ messages in thread
From: Matthew Martin @ 2015-12-11 7:52 UTC (permalink / raw)
To: zsh-workers
On Fri, Dec 11, 2015 at 08:21:05AM +0100, Oliver Kiddle wrote:
> Matthew Martin wrote:
> > 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.
>
> This seems sensible.
>
> Don't some systems including even Mac OS X use something other than ELF?
> With that in mind, should it perhaps be named _object_files?
I considered that, but picked elf for no real reason. _object_files is
fine with me.
> Also, can we perhaps be a little more generous on matching core files?
>
> On Linux it is configurable via /proc/sys/kernel/core_pattern, similarly
> on Solaris via coreadm(1M) and FreeBSD via the sysctl variable
> kern.corefile.
>
> While the defaults for those systems are core.pid, core and cmd.core,
> respectively, I'd be inclined to match (core*|*.core) on any system.
Works for me.
diff --git a/Completion/Unix/Command/_elfdump b/Completion/Unix/Command/_elfdump
index ee92402..065f4b9 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:_object_files"
)
;;
freebsd*) args+=( '-a[dump all information]' ) ;;
diff --git a/Completion/Unix/Command/_nm b/Completion/Unix/Command/_nm
index d171ef5..73d7508 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:_object_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..cc213d9 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:_object_files'
diff --git a/Completion/Unix/Command/_readelf b/Completion/Unix/Command/_readelf
index 9312ea8..a474a8d 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:_object_files"
)
case $variant in
diff --git a/Completion/Unix/Type/_object_files b/Completion/Unix/Type/_object_files
new file mode 100644
index 0000000..31a13ae
--- /dev/null
+++ b/Completion/Unix/Type/_object_files
@@ -0,0 +1,11 @@
+#autoload
+
+local expl
+
+_description files expl 'object file'
+
+__object_file() {
+ [[ -x $REPLY || $REPLY = *.([ao]|so|elf)(.<->)## || $REPLY = (core*|*.core) ]]
+}
+
+_files -g '*(-.e,__object_file,)'
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-12-11 7:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-11 6:44 [patch] Add _elf_files type Matthew Martin
2015-12-11 7:21 ` Oliver Kiddle
2015-12-11 7:52 ` Matthew Martin
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).