ruby-elf 1.0.6.1 → 1.0.7

data/lib/elf/sunw.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Simple ELF parser for Ruby
 #
-# Copyright © 2008-2010 Diego E. "Flameeyes" Pettenò <flameeyes@gmail.com>
+# Copyright © 2008-2010 Diego Elio Pettenò <flameeyes@flameeyes.eu>
 # Portions inspired by elf.py
 #   Copyright © 2002 Netgraft Corporation
 # Portions inspired by elf.h

data/lib/elf/symbol.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Simple ELF parser for Ruby
 #
-# Copyright © 2007-2010 Diego E. "Flameeyes" Pettenò <flameeyes@gmail.com>
+# Copyright © 2007-2010 Diego Elio Pettenò <flameeyes@flameeyes.eu>
 # Portions inspired by elf.py
 #   Copyright © 2002 Netgraft Corporation
 # Portions inspired by elf.h
@@ -160,7 +160,7 @@ module Elf
       if @name.is_a? Integer and @symsect.link
         begin
           name = @symsect.link[@name]
-        rescue StringTable::InvalidIndex
+        rescue Utilities::OffsetTable::InvalidIndex
           raise InvalidName.new(@name, self, @symsect)
         end
         @name = name if name
@@ -196,10 +196,14 @@ module Elf
 
       return '' if version_idx == 1
 
-      if section.nil? or @file['.gnu.version_d'][version_idx].nil?
+      begin
+        if section.nil?
+          return @file['.gnu.version_r'][version_idx][:name]
+        else
+          return @file['.gnu.version_d'][version_idx][:names][0]
+        end
+      rescue Elf::File::MissingSection
         return @file['.gnu.version_r'][version_idx][:name]
-      else
-        return @file['.gnu.version_d'][version_idx][:names][0]
       end
     end
 
@@ -262,12 +266,14 @@ module Elf
 
       when bind == Binding::Weak
         nmflag = case type
-                 when Type::Object then "V"
-                 else "W"
+                 when Type::Object then 'V'
+                   # we cannot use 'v' when value is zero, as for a
+                   # variable, a zero address is correct, it's just
+                   # functions that cannot be at zero address.
+                 when value == 0 then 'w'
+                 else 'W'
                  end
 
-        nmflag.downcase! if value == 0
-
       when bind == Binding::GNU::Unique
         nmflag = 'u'
 
@@ -291,7 +297,15 @@ module Elf
                  end
 
       when type == Type::None
-        nmflag = 'N'
+        # try being smarter than simply reporthing this as a none-type
+        # symbol, as some compilers (namely pathCC) emit STT_NONE
+        # symbols that are instead functions.
+        nmflag = case
+                 when section.is_a?(Integer) then "N"
+                 when section.flags.include?(Elf::Section::Flags::ExecInstr) then "T"
+                 when section.type == Elf::Section::Type::NoBits then "B"
+                 else "N"
+                 end
       when type == Type::Func
         nmflag = 'T'
       when type == Type::Section
@@ -318,13 +332,7 @@ module Elf
     # Reports a string full of whitespace if the symbols is not
     # defined (as there is no address)
     def address_string
-      addrsize = (@file.elf_class == Elf::Class::Elf32 ? 8 : 16)
-
-      if section
-        sprintf("%0#{addrsize}x", value)
-      else
-        ' ' * addrsize
-      end
+      section ? sprintf("%0#{@file.address_print_size}x", value) : ''
     end
 
     # Check whether two symbols are the same
@@ -364,29 +372,27 @@ module Elf
       return true
     end
 
-    begin
-      require 'elf/symbol/demangler_gcc3'
-
-      Demanglers = [ Elf::Symbol::Demangler::GCC3 ]
-      def demangle
-        return @demangled if @demangled
-
-        Demanglers.each do |demangler|
-          break if (@demangled ||= demangler.demangle(name))
-        end
-
-        # We're going to remove top-namespace specifications as we don't
-        # need them, but it's easier for the demangler to still emit
-        # them.
-        @demangled.gsub!(/(^| |\()::/, '\1') if @demangled
-
-        return @demangled ||= name
-      end
-    rescue LoadError
+#    begin
+#      Demanglers = [  ]
+#      def demangle
+#        return @demangled if @demangled
+#
+#        Demanglers.each do |demangler|
+#          break if (@demangled ||= demangler.demangle(name))
+#        end
+#
+#        # We're going to remove top-namespace specifications as we don't
+#        # need them, but it's easier for the demangler to still emit
+#        # them.
+#        @demangled.gsub!(/(^| |\()::/, '\1') if @demangled
+#
+#        return @demangled ||= name
+#      end
+#    rescue LoadError
       def demangle
         return name
       end
-    end
+#    end
 
     private
     def version_index

data/lib/elf/symboltable.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Simple ELF parser for Ruby
 #
-# Copyright © 2007-2010 Diego E. "Flameeyes" Pettenò <flameeyes@gmail.com>
+# Copyright © 2007-2010 Diego Elio Pettenò <flameeyes@flameeyes.eu>
 # Portions inspired by elf.py
 #   Copyright © 2002 Netgraft Corporation
 # Portions inspired by elf.h

data/lib/elf/tools.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright © 2008-2010 Diego E. "Flameeyes" Pettenò <flameeyes@gmail.com>
+# Copyright © 2008-2010 Diego Elio Pettenò <flameeyes@flameeyes.eu>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -224,7 +224,7 @@ module Elf
         # arguments.
         @targets = ARGV.collect { |argument|
           if argument[0..0] == "@"
-            ::File.new(argument[1..-1]).read.split(/\r?\n/)
+            ::File.read(argument[1..-1]).split(/\r?\n/)
           else
             argument
           end
@@ -239,6 +239,7 @@ module Elf
             try_execute(input.sub(/\r?\n/, ''))
           }
         else
+          $stdin.close
           @targets.uniq.each { |target| try_execute(target) }
         end
 

data/lib/elf/utils/loader.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright © 2009-2010 Diego E. "Flameeyes" Pettenò <flameeyes@gmail.com>
+# Copyright © 2009-2010 Diego Elio Pettenò <flameeyes@flameeyes.eu>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

data/lib/elf/utils/offsettable.rb

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+# Offset-based string table
+#
+# Copyright © 2007-2012 Diego Elio Pettenò <flameeyes@flameeyes.eu>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this generator; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Elf
+  module Utilities
+    class OffsetTable
+      class InvalidIndex < Exception
+        def initialize(idx, max_idx)
+          super("Invalid index #{idx} (maximum index: #{max_idx})")
+        end
+      end
+
+      def initialize(content, separator)
+        @content = content
+        @separator = separator
+      end
+
+      def size
+        @content.size
+      end
+
+      def [](idx)
+        raise InvalidIndex.new(idx, size) if idx >= size
+
+        # find the first occurrence of the separator starting from the
+        # given index
+        endidx = @content.index(@separator, idx)
+
+        return @content[idx..endidx].chomp(@separator)
+      end
+    end
+  end
+end

data/lib/elf/utils/pool.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright © 2009 Alex Legler <a3li@gentoo.org>
-# Copyright © 2009-2010 Diego E. "Flameeyes" Pettenò <flameeyes@gmail.com>
+# Copyright © 2009-2010 Diego Elio Pettenò <flameeyes@flameeyes.eu>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

data/lib/elf/value.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Simple ELF parser for Ruby
 #
-# Copyright © 2007-2010 Diego E. "Flameeyes" Pettenò <flameeyes@gmail.com>
+# Copyright © 2007-2010 Diego Elio Pettenò <flameeyes@flameeyes.eu>
 # Portions inspired by elf.py
 #   Copyright © 2002 Netgraft Corporation
 # Portions inspired by elf.h

data/manpages/cowstats.1

@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: cowstats
 .\"    Author: 
-.\" Generator: DocBook XSL-NS Stylesheets v1.76.0 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
 .\"      Date: October 2008
 .\"    Manual: Reference
 .\"    Source: ruby-elf
@@ -171,7 +171,7 @@ Related tools:
 \fBobjdump\fR(1)\&.
 .SH "AUTHOR"
 .PP
-\fBDiego E. Pettenò\fR <\&flameeyes@gmail.com\&>
+\fBDiego E. Pettenò\fR <\&flameeyes@flameeyes.eu\&>
 .RS 4
 Author and main contributor.
 .RE

data/manpages/cowstats.1.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!--
-Copyright © 2008-2011, Diego "Flameeyes" Pettenò <flameeyes@gmail.com>
+Copyright © 2008-2011, Diego Elio Pettenò <flameeyes@flameeyes.eu>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

data/manpages/elfgrep.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: elfgrep
 .\"    Author: 
-.\" Generator: DocBook XSL-NS Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: January 2011
+.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
+.\"      Date: November 2011
 .\"    Manual: Reference
 .\"    Source: ruby-elf
 .\"  Language: English
 .\"
-.TH "ELFGREP" "1" "January 2011" "ruby-elf" "Reference"
+.TH "ELFGREP" "1" "November 2011" "ruby-elf" "Reference"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -31,7 +31,7 @@
 elfgrep \- Search for symbols matching an expression in ELF files
 .SH "SYNOPSIS"
 .HP \w'\fBelfgrep\fR\ 'u
-\fBelfgrep\fR [\fB\-\-fixed\-strings\fR] [\fB\-\-ignore\-case\fR] [\fB\-\-match\-version\fR] [\fB\-\-match\-undefined\fR | \fB\-\-match\-defined\fR] [\fB\-\-invert\-match\fR] [\fB\-\-count\fR] [\fB\-\-files\-without\-match\fR | \fB\-\-files\-with\-matches\fR] [\fB\-\-with\-filename\fR | \fB\-\-no\-filename\fR] [\fB\-\-null\fR] [\fB\-\-quiet\fR] [\fB\-\-recursive\fR] {\fB\-\-regexp\fR\ \fIPATTERN\fR... | \fIPATTERN\fR} [\fB@\fR\fIfile\fR | \fIfile\fR...]
+\fBelfgrep\fR [\fB\-\-fixed\-strings\fR] [\fB\-\-ignore\-case\fR] [\fB\-\-match\-version\fR] [\fB\-\-match\-undefined\fR | \fB\-\-match\-defined\fR] [\fB\-\-invert\-match\fR] [\fB\-\-count\fR] [\fB\-\-files\-without\-match\fR | \fB\-\-files\-with\-matches\fR] [\fB\-\-with\-filename\fR | \fB\-\-no\-filename\fR] [\fB\-\-null\fR] [\fB\-\-symbol\-regexp\fR] [\fB\-\-quiet\fR] [\fB\-\-recursive\fR] {\fB\-\-regexp\fR\ \fIPATTERN\fR... | \fB\-\-file\fR\ \fIFILE\fR... | \fIPATTERN\fR} [\fB@\fR\fIfile\fR | \fIfile\fR...]
 .SH "DESCRIPTION"
 .PP
 
@@ -56,6 +56,35 @@ Use
 as the pattern\&. This can be used to specify multiple search patterns, or to protect a pattern beginning with a hyphen (\-)\&.
 .RE
 .PP
+\fB\-f\fR \fIFILE\fR, \fB\-\-file\fR \fIFILE\fR
+.RS 4
+Obtain patterns from
+\fIFILE\fR, one per line\&.
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBBehaviour difference from grep semantics\fR
+.ps -1
+.br
+For
+grep\*(Aqs
+\fB\-\-file\fR
+option, an empty line (with only a newline character) is a \(lqmatch all\(rq pattern, while a totally empty file (zero bytes sized) is a \(lqmatch none\(rq pattern\&. This doesn\*(Aqt make much sense, especially for
+elfgrep, so both empty lines and empty files are simply skipped over\&. Passing
+\fB\-\-file\fR
+pointing to a file that gets totally ignored (zero bytes sized, or a sequence of newline characters) will still stop
+elfgrep
+from looking for a pattern in the first non\-option argument\&.
+.sp .5v
+.RE
+.RE
+.PP
 \fB\-i\fR, \fB\-\-ignore\-case\fR
 .RS 4
 Ignore case distinction in both the
@@ -89,6 +118,11 @@ Invert the sense of matching, to select non\-matching symbols\&. This does not i
 and
 \fB\-\-no\-match\-defined\fR\&.
 .RE
+.PP
+\fB\-s\fR, \fB\-\-symbol\-regexp\fR
+.RS 4
+Select only those matches that exactly match the whole line\&.
+.RE
 .SS "Output Control"
 .PP
 \fB\-c\fR, \fB\-\-count\fR
@@ -173,7 +207,7 @@ grep
 man page, to avoid confusing with different wordings\&.
 .SH "AUTHOR"
 .PP
-\fBDiego E. Pettenò\fR <\&flameeyes@gmail.com\&>
+\fBDiego E. Pettenò\fR <\&flameeyes@flameeyes.eu\&>
 .RS 4
 Author and main contributor.
 .RE

data/manpages/elfgrep.1.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!--
-Copyright © 2011, Diego "Flameeyes" Pettenò <flameeyes@gmail.com>
+Copyright © 2011, Diego Elio Pettenò <flameeyes@flameeyes.eu>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
     <refentry>
       <info>
-        <date>January 2011</date>
+        <date>November 2011</date>
         <productname>ruby-elf</productname>
       </info>
       <refmeta>
@@ -100,6 +100,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
             <option>--null</option>
           </arg>
 
+          <arg choice="opt">
+            <option>--symbol-regexp</option>
+          </arg>
+
           <xi:include href="common.xmli"  xpointer="xpointer(id('filelist.synopsis.options')/*)" />
 
           <group choice="req">
@@ -108,6 +112,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
               <replaceable>PATTERN</replaceable>
             </arg>
 
+            <arg choice="plain" rep="repeat">
+              <option>--file</option>
+              <replaceable>FILE</replaceable>
+            </arg>
+
             <arg choice="plain">
               <replaceable>PATTERN</replaceable>
             </arg>
@@ -165,6 +174,38 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
               </listitem>
             </varlistentry>
 
+            <varlistentry>
+              <term>
+                <option>-f</option>
+                <replaceable>FILE</replaceable>
+              </term>
+              <term>
+                <option>--file</option>
+                <replaceable>FILE</replaceable>
+              </term>
+
+              <listitem>
+                <para>
+                  Obtain patterns from <replaceable>FILE</replaceable>, one per line.
+                </para>
+
+                <note>
+                  <title>Behaviour difference from <application>grep</application> semantics</title>
+
+                  <para>
+                    For <application>grep</application>'s <option>--file</option> option, an empty
+                    line (with only a newline character) is a “match all” pattern, while a totally
+                    empty file (zero bytes sized) is a “match none” pattern. This doesn't make much
+                    sense, especially for <application>elfgrep</application>, so both empty lines
+                    and empty files are simply skipped over. Passing <option>--file</option>
+                    pointing to a file that gets totally ignored (zero bytes sized, or a sequence of
+                    newline characters) will still stop <application>elfgrep</application> from
+                    looking for a pattern in the first non-option argument.
+                  </para>
+                </note>
+              </listitem>
+            </varlistentry>
+
             <varlistentry>
               <term><option>-i</option></term>
               <term><option>--ignore-case</option></term>
@@ -223,6 +264,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
                 </para>
               </listitem>
             </varlistentry>
+
+            <varlistentry>
+              <term><option>-s</option></term>
+              <term><option>--symbol-regexp</option></term>
+              <listitem>
+                <para>
+                  Select only those matches that exactly match the whole line.
+                </para>
+              </listitem>
+            </varlistentry>
           </variablelist>
         </refsect2>