ruby-elf 1.0.6.1 → 1.0.7

data/DONATING

@@ -38,5 +38,5 @@ willing to donate.
 
 If you know other foundations, donations to which could be deduced
 from taxes in other countries, feel free to suggest more by mailing me
-at flameeyes@gmail.com . Hopefully wherever the research is based, the
+at flameeyes@flameeyes.eu . Hopefully wherever the research is based, the
 improvements will come equally.

data/bin/cowstats

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- mode: ruby; 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

data/bin/elfgrep

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- mode: ruby; coding: utf-8 -*-
-# Copyright © 2011 Diego E. "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
@@ -52,6 +52,10 @@ module Elf::Tools
                    ["--ignore-case", "-i", GetoptLong::NO_ARGUMENT],
                    # Use NULLs to terminate filenames
                    ["--null", "-Z", GetoptLong::NO_ARGUMENT],
+                   # read the list of patterns from the given file
+                   ["--file", "-f", GetoptLong::REQUIRED_ARGUMENT],
+                   # match the whole symbol
+                   ["--symbol-regexp", "-s", GetoptLong::NO_ARGUMENT],
                   ]
 
       @invert_match = false
@@ -60,6 +64,7 @@ module Elf::Tools
       @match_symbols = nil
 
       @patterns = []
+      @pattern_is_first = true
     end
 
     # We define callbacks for some behaviour-changing options as those
@@ -104,9 +109,19 @@ module Elf::Tools
     end
 
     def self.regexp_cb(pattern)
+      @pattern_is_first = false
+
       @patterns << pattern
     end
 
+    def self.file_cb(filename)
+      @pattern_is_first = false
+
+      @patterns += File.readlines(filename).
+        each { |l| l.strip! }.
+        reject { |l| l.empty? }
+    end
+
     def self.after_options
       if @no_match_undefined and @no_match_defined
         puterror "you need to match at least defined or undefined symbols"
@@ -122,7 +137,7 @@ module Elf::Tools
       # to be given by stdin, and that won't include the actual pattern,
       # if we have an @-prefixed argument, that's a list of targets and
       # can't include the pattern either.
-      if (@patterns.size == 0 and
+      if (@pattern_is_first and
           @targets.size >= 1 and
           @targets[0] !~ /^@/)
 
@@ -139,15 +154,40 @@ module Elf::Tools
       @file_list_fmt = "%s#{@null ? "\0" : "\n"}"
 
       regexp_options = @ignore_case ? Regexp::IGNORECASE : 0
-      @regexp = Regexp.union(@patterns.collect { |pattern|
-                               if @match == :fixed_strings
-                                 pattern.split(/\r?\n/).collect { |string|
-                                   Regexp.new("^" + Regexp.escape(string) + "$", regexp_options)
-                                 }
-                               else
-                                 Regexp.new(pattern, regexp_options)
-                               end
-                             }.flatten)
+      regexps = @patterns.collect { |pattern|
+        if @match == :fixed_strings
+          pattern.split(/\r?\n/).collect { |string|
+            Regexp.new(Regexp.escape(string), regexp_options)
+          }
+        else
+          Regexp.new(pattern, regexp_options)
+        end
+      }.flatten
+
+      if @symbol_regexp
+        # if we're matching a whole symbol name we need the longest
+        # match, and Ruby's union of regexp does _not_ enforce that,
+        # so we have to do it the long way.
+
+        @match_lambda = proc { |symbol|
+          longest_match = ""
+
+          regexps.each { |re|
+            m = re.match(symbol)
+            longest_match = m[0] unless (m.nil? or m[0].length < longest_match.length)
+          }
+
+          (longest_match != symbol) == @invert_match
+        }
+      else
+        # if we're just doing a loose match, unite the regexps and do
+        # it the fast way.
+        regexp = Regexp.union(regexps)
+
+        @match_lambda = proc { |symbol|
+          regexp.match(symbol).nil? == @invert_match
+        }
+      end
     end
 
     def self.analysis(file)
@@ -181,16 +221,15 @@ module Elf::Tools
           symname = symbol.name
           symname += "@#{symbol.version}" if @match_version
 
-          # We don't care where it matches, but we do care that it matches
-          # or not; we use an invert match since we have to further compare
-          # that to @invert_match
-          if (@invert_match == (@regexp =~ symname).nil?)
+          if (@match_lambda.call(symname))
             matches = matches+1
 
             break unless @show == :full_match
             next if @count
 
-            puts "#{file_prefix}#{symbol.address_string} #{symbol.nm_code rescue '?'} #{symname}"
+            printf("%s%#{elf.address_print_size}s %s %s\n",
+                  file_prefix, symbol.address_string,
+                  (symbol.nm_code rescue '?'), symname)
           end
         end
 

data/bin/missingstatic

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- mode: ruby; 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

data/bin/rbelf-nm

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-# Copyright © 2007-2010 Diego E. "Flameeyes" Pettenò <flameeyes@gmail.com>
+# Copyright © 2007-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
@@ -28,23 +28,40 @@ module Elf::Tools
       super
       @options |= [
                    ["--dynamic", "-D", GetoptLong::NO_ARGUMENT],
-                   ["--demangle", "-C", GetoptLong::NO_ARGUMENT]
+                   ["--demangle", "-C", GetoptLong::NO_ARGUMENT],
+                   ["--sort-by", "-S", GetoptLong::REQUIRED_ARGUMENT],
+                   ["--show-version", "-V", GetoptLong::NO_ARGUMENT],
                   ]
 
       @scan_section = '.symtab'
       @demangle = false
       @exitval = 0
+      @show_version = false
 
-      # do not use multiple threads (unless we start caching the
-      # output, and synchronise on it).
-      @execution_threads = nil
+      @sort = :name
     end
 
     def self.dynamic_cb
       @scan_section = '.dynsym'
     end
 
+    def self.sort_by_cb(attr)
+      case attr
+      when 'address'
+        @sort = :address
+      when 'name'
+        @sort = :name
+      when 'none'
+        @sort = nil
+      else
+        puterror "invalid sort attribute: #{attr}"
+        exit -1
+      end
+    end
+
     def self.analysis(file)
+      symbols = []
+
       Elf::File.open(file) do |elf|
         if not elf.has_section? @scan_section
           puterror "No symbols"
@@ -55,19 +72,37 @@ module Elf::Tools
         elf[@scan_section].each do |sym|
           next if sym.name == ''
           begin
-            flag = sym.nm_code
+            code = sym.nm_code
           rescue Elf::Symbol::UnknownNMCode => e
             puterror(e.message)
-            flag = "?"
+            code = "?"
           end
 
-          version_name = sym.version
-          version_name = version_name ? "@#{sym.version_default? ? '@' : ''}#{version_name}" : ""
-
           name = @demangle ? sym.demangle : sym.name
 
-          puts "#{sym.address_string} #{flag} #{name}#{version_name}"
+          if @show_version and sym.version
+            name = sprintf("%s@%s%s",
+                           name,
+                           sym.version_default? ? '@' : '',
+                           sym.version)
+          end
+
+          symbols << {
+            :address => sym.address_string,
+            :code => code,
+            :name => name
+          }
         end
+
+        symbols.sort! { |x, y| x[@sort] <=> y[@sort] } unless @sort.nil?
+
+        format_sym = "%#{elf.address_print_size}s %s %s\n"
+        @output_mutex.synchronize {
+          symbols.each do |sym|
+            printf(format_sym,
+                   sym[:address], sym[:code], sym[:name])
+          end
+        }
       end
     end
 

data/bin/rbelf-read

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- mode: ruby; coding: utf-8 -*-
-# Copyright © 2008-2011 Diego E. "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
@@ -43,8 +43,6 @@ module Elf::Tools
     def self.analysis(file)
       elf = Elf::File.open(file)
 
-      @addrsize = (elf.elf_class == Elf::Class::Elf32 ? 8 : 16)
-
       @output_mutex.synchronize {
         printf("\nFile: %s\n", file) if @targets.size != 1
         read_file_header(elf) if @file_header
@@ -57,12 +55,12 @@ module Elf::Tools
       printf("There are %d section headers, starting at offset 0x%x:\n\nSection Headers:\n",
              elf.sections, elf.shoff)
 
-      printf("[Nr] Name                 Type          Addr             Off      Size     ES Flags Lk Inf Al\n")
+      printf("[Nr] Name                    Type          Addr             Off      Size     ES Flags Lk Inf Al\n")
 
       elf.each_section do |section|
-        printf("[%2d] %s %s %0#{@addrsize}x %08x %08x %2d %s %2d %3d %2d\n",
+        printf("[%2d] %s %s %0#{elf.address_print_size}x %08x %08x %2d %s %2d %3d %2d\n",
                section.index,
-               section.name.ljust(20),
+               section.name.ljust(23),
                section.type.mnemonic.upcase.ljust(13),
                section.addr, section.offset, section.size, section.entsize,
                section.flags_s.ljust(5), section.link.to_i, section.info, section.addralign)

data/bin/rbelf-size

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- mode: ruby; coding: utf-8 -*-
-# Copyright © 2008-2011 Diego E. "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
@@ -143,7 +143,9 @@ module Elf::Tools
     end
 
     def self.count_allocated(results)
-      results[:allocated] = results.values.inject { |sum, val| sum += val rescue sum}
+      results[:allocated] = results.values.inject { |sum, val|
+        sum = val.is_a?(String) ? sum : (sum+val)
+      }
     end
 
     def self.apply_differential(results)

data/bin/verify-lfs

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- mode: ruby; coding: utf-8 -*-
-# Copyright © 2010 Diego E. "Flameeyes" Pettenò <flameeyes@gmail.com>
+# Copyright © 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/extras/bindings-parsers.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-# Copyright © 2006-2008, Diego E. "Flameeyes" Pettenò <flameeyes@gmail.com>
+# Copyright © 2006-2008, 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/bytestream-reader.rb

@@ -3,7 +3,7 @@
 # This class is a simple File derivative from which you can read
 # integers of different sizes, in any endianness.
 #
-# Copyright © 2007-2010 Diego E. "Flameeyes" Pettenò <flameeyes@gmail.com>
+# Copyright © 2007-2010 Diego Elio Pettenò <flameeyes@flameeyes.eu>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files

data/lib/elf.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 glibc's elf.h
@@ -29,7 +29,7 @@ require 'elf/file'
 require 'elf/section'
 
 module Elf
-  VERSION = "1.0.6.1"
+  VERSION = "1.0.7"
 
   MagicString = "\177ELF"
 

data/lib/elf/dynamic.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
@@ -122,7 +122,7 @@ module Elf
              0x7ffffffd => [ :Auxiliary, "AUXILIARY", :Value ]
            )
 
-      OsSpecific = 0x6000000d..0x6ffff000
+      OsSpecific = 0x60000000..0x6fffffff
       ProcSpecific = 0x70000000..0x7fffffff
       SpecialRanges = {
         "DT_LOOS" => OsSpecific,

data/lib/elf/file.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
@@ -339,6 +339,15 @@ module Elf
       end
     end
 
+    # Returns the hex address size for the file.
+    #
+    # Since each ELF file uses either 32- or 64-bit addresses, it is
+    # important to know how many characters a file's address would
+    # require when printed as an hexadecimal string.
+    def address_print_size
+      (@elf_class == Elf::Class::Elf32 ? 8 : 16)
+    end
+
     def summary
       $stdout.puts "ELF file #{path}"
       $stdout.puts "ELF class: #{@elf_class} #{@data_encoding} ver. #{@version}"

data/lib/elf/gnu.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/section.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/stringtable.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
@@ -22,28 +22,18 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 require 'elf/section'
+require 'elf/utils/offsettable'
 
 module Elf
   class StringTable < Section
     def load_internal
-      @rawtable = @file.readexactly(@size)
-    end
-
-    class InvalidIndex < Exception
-      def initialize(idx, max_idx)
-        super("Invalid index #{idx} (maximum index: #{max_idx})")
-      end
+      @rawtable = Utilities::OffsetTable.new(@file.readexactly(@size), "\x00")
     end
 
     def [](idx)
       load unless @rawtable
 
-      raise InvalidIndex.new(idx, @rawtable.size) if
-        idx >= @rawtable.size
-
-      endidx = @rawtable.index("\x00", idx)
-
-      return @rawtable[idx..endidx].chomp("\x00")
+      @rawtable[idx]
     end
   end
 end