ragweed 0.1.7.3 → 0.2.0.pre1

data/lib/ragweed/wraptux/wraptux.rb

@@ -1,76 +1,72 @@
-require 'dl'
+require 'ffi'
 
-module Ragweed; end
 module Ragweed::Wraptux
-  LIBS = Hash.new do |h, str|
-    if not str =~ /^[\.\/].*/
-      str = "/lib/" + str
-    end
-    if not str =~ /.*\.so.6$/
-      str = str + ".so.6"
-    end
-    h[str] = DL.dlopen(str)
+  module Libc
+    extend FFI::Library
+    ffi_lib FFI::Library::LIBC
+    attach_function 'ptrace', [ :ulong, :pid_t, :ulong, :ulong ], :long
+    attach_function 'wait', [ :pointer ], :int
+    attach_function 'waitpid', [ :int, :pointer, :int ], :int
+    attach_function 'kill', [ :int, :int ], :int
+    attach_function 'malloc', [ :size_t ], :pointer
+    attach_function 'free', [ :pointer ], :void
   end
-
-  CALLS = Hash.new do |h, str|
-    lib = proc = args = ret = nil
-    lib, rest = str.split "!"
-    proc, rest = rest.split ":"
-    args, ret = rest.split("=") if rest
-    ret ||= "0"
-    raise "need proc" if not proc
-    h[str] = LIBS[lib][proc, ret + args]
+  
+  class PTRegs < FFI::Struct
+      include Ragweed::FFIStructInclude
+      layout :ebx, :ulong,
+      :ecx, :ulong,
+      :edx, :ulong,
+      :esi, :ulong,
+      :edi, :ulong,
+      :ebp, :ulong,
+      :eax, :ulong,
+      :xds, :ulong,
+      :xes, :ulong,
+      :xfs, :ulong,
+      :xgs, :ulong,
+      :orig_eax, :ulong,
+      :eip, :ulong,
+      :xcs, :ulong,
+      :eflags, :ulong,
+      :esp, :ulong,
+      :xss, :ulong
   end
 
-  NULL = DL::PtrData.new(0)
-
-  SIZEOFINT = DL.sizeof('I')
-  SIZEOFLONG = DL.sizeof('L')
-
   class << self
-    #long ptrace(enum __ptrace_request request, pid_t pid, void *addr, void *data);
-    def ptrace(request, pid, addr, data)
-      DL.last_error = 0
-      r = CALLS["libc!ptrace:IIII=I"].call(request, pid, addr, data).first
-      raise SystemCallError.new("ptrace", DL.last_error) if r == -1 and DL.last_error != 0
-
-      case request
-      when Ptrace::PEEK_TEXT, Ptrace::PEEK_DATA
-        return r
-      end
-    end
-
-    def malloc(sz)
-      r = CALLS["libc!malloc:L=L"].call(sz)
-      return r
-    end
-
-    #wait(int *status);
+    # pid_t wait(int *status);
     def wait
-      status = ("\x00"*SIZEOFINT).to_ptr.to_i
-      r = CALLS["libc!wait:I=I"].call(status).first
-      raise SystemCallError.new("wait", DL.last_error) if r == -1
-      self.continue # continue with the ptrace at this point
-      return status.to_s(SIZEOFINT).unpack('i_').first
+      stat = FFI::MemoryPointer.new(:int, 1)
+      FFI.errno = 0
+      pid = Libc.wait stat
+      raise SystemCallError.new "wait", FFI.errno if pid == -1
+      [pid, stat.read_pointer.get_int32]
     end
-
-    #waitpid(pid_t pid, int *stat_loc, int options);
-    def waitpid(pid, opt=1)
-      pstatus = ("\x00"*SIZEOFINT).to_ptr
-      r = CALLS["libc!waitpid:IPI=I"].call(pid, pstatus, opt).first
-      raise SystemCallError.new("waitpid", DL.last_error) if r == -1
-      return [r, pstatus.to_s(SIZEOFINT).unpack('i_').first]
+    
+    # pid_t waitpid(pid_t pid, int *status, int options);
+    def waitpid pid, opts = 0
+      p = FFI::MemoryPointer.new(:int, 1)
+      FFI.errno = 0
+      r = Libc.waitpid(pid,p,opts)
+      raise SystemCallErro.new "waitpid", FFI.errno if r == -1
+      status = p.get_int32(0)
+      [r, status]
     end
 
-    #kill(pid_t pid, int sig);
-    def kill(pid, sig)
-      DL.last_error = 0
-      r = CALLS["libc!kill:II=I"].call(pid,sig).first
-      raise SystemCallError.new("kill",DL.last_error) if r != 0
+    # int kill(pid_t pid, int sig);
+    def kill pid, sig
+      FFI.errno = 0
+      r = Libc.kill pid, sig
+      raise SystemCallError.new "waitpid", FFI.errno if r == -1
+      r
     end
-
-    def getpid
-      CALLS["libc!getpid:=I"].call.first
+    
+    #long ptrace(enum __ptrace_request request, pid_t pid, void *addr, void *data);
+    def ptrace req, pid, addr, data
+      FFI.errno = 0
+      r = Libc.ptrace req, pid, addr, data
+      #raise SystemCallError.new "ptrace", FFI.errno if r == -1 and !FFI.errno.zero?
+      r
     end
   end
 end

data/lib/ragweed/wraptux.rb

@@ -1,11 +1,11 @@
 # Dir[File.expand_path("#{File.dirname(__FILE__)}/wraptux/*.rb")].each do |file|
 #   require file
 # end
+
 module Ragweed; end
 module Ragweed::Wraptux
-
   # :stopdoc:
-  VERSION = '0.1.7.3'
+  VERSION = File.read(File.join(File.dirname(__FILE__),"..","..","VERSION")).strip
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
@@ -47,8 +47,7 @@ module Ragweed::Wraptux
     dir ||= ::File.basename(fname, '.*')
     search_me = ::File.expand_path(
         ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
-    
-    Dir.glob(search_me).sort.each {|rb| require rb}
+    Dir.glob(search_me).sort.each {|rb| require rb }
     # require File.dirname(File.basename(__FILE__)) + "/#{x}"
 
   end

data/lib/ragweed.rb

@@ -1,8 +1,9 @@
+require 'ffi'
 
 module Ragweed
 
   # :stopdoc:
-  VERSION = '0.1.7.3'
+  VERSION = File.read(File.join(File.dirname(__FILE__),"..","VERSION")).strip
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
@@ -38,7 +39,6 @@ module Ragweed
     dir ||= ::File.basename(fname, '.*')
     search_me = ::File.expand_path(
         ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
-
     # Don't want to load wrapper or debugger here.
     Dir.glob(search_me).sort.reject{|rb| rb =~ /(wrap|debugger|rasm[^\.])/}.each {|rb| require rb}
     # require File.dirname(File.basename(__FILE__)) + "/#{x}"d
@@ -48,15 +48,18 @@ module Ragweed
     dir ||= ::File.basename(fname, '.*')
     pkgs = ""
     dbg = ""
+
     case
-    when RUBY_PLATFORM =~ /win(dows|32)/i
+    when ::FFI::Platform.windows?
       pkgs = '32'
-    when RUBY_PLATFORM =~ /darwin/i
+    when ::FFI::Platform.mac?
       pkgs = 'osx'
-    when RUBY_PLATFORM =~ /linux/i
+    # coming soon
+    # when ::FFI::Platform.bsd?
+    #   pkgs = "bsd"
+    when ::FFI::Platform.unix? && ! ::FFI::Platform.bsd?
+      # FFI doesn't specifically detect linux so... we punt
       pkgs = 'tux'
-    # when RUBY_PLATFORM =~ /java/i
-      # TODO - Java port using jni?
     else
       warn "Platform not supported no wrapper libraries loaded."
     end
@@ -68,6 +71,32 @@ module Ragweed
   end
 end  # module Ragweed
 
+## FFI Struct Accessor Methods
+module Ragweed::FFIStructInclude
+  if RUBY_VERSION < "1.9"
+    def methods regular=true
+      super + self.offsets.map{|x| x.first.to_s}
+    end
+  else
+    def methods regular=true
+      super + self.offsets.map{|x| x.first}
+    end
+  end
+
+  def method_missing meth, *args
+    super unless self.respond_to? meth
+    if meth.to_s =~ /=$/
+      self.__send__(:[]=, meth.to_s.gsub(/=$/,'').intern, *args)
+    else
+      self.__send__(:[], meth, *args)
+    end
+  end
+
+  def respond_to? meth, include_priv=false
+    mth = meth.to_s.gsub(/=$/,'')
+    self.offsets.map{|x| x.first.to_s}.include? mth || super
+  end
+end
 
 # pkgs = %w[arena sbuf ptr process event rasm blocks detour trampoline device debugger hooks]
 # pkgs << 'wrap32' if RUBY_PLATFORM =~ /win(dows|32)/i
@@ -80,5 +109,4 @@ end  # module Ragweed
 
 Ragweed.require_os_libs_relative_to(__FILE__)
 Ragweed.require_all_libs_relative_to(__FILE__)
-
 # EOF

data/ragweed.gemspec

@@ -1,34 +1,104 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{ragweed}
-  s.version = "0.1.7.3"
+  s.version = "0.2.0.pre1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["tduehr, tqbf, struct"]
-  s.date = %q{2009-09-21}
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = ["tduehr", "struct", "tqbf"]
+  s.date = %q{2010-11-19}
   s.description = %q{General debugging tool written in Ruby for OSX/Win32/Linux}
   s.email = %q{td@matasano.com}
-  s.extra_rdoc_files = ["History.txt", "README.rdoc", "README.txt"]
-  s.files = ["History.txt", "README.rdoc", "README.txt", "Rakefile", "examples/hittracertux.rb", "examples/hittracerx.rb", "examples/hook_notepad.rb", "examples/snicker.rb", "examples/tux-example.rb", "lib/ragweed.rb", "lib/ragweed/arena.rb", "lib/ragweed/blocks.rb", "lib/ragweed/debugger32.rb", "lib/ragweed/debuggerosx.rb", "lib/ragweed/debuggertux.rb", "lib/ragweed/detour.rb", "lib/ragweed/ptr.rb", "lib/ragweed/rasm.rb", "lib/ragweed/rasm/bblock.rb", "lib/ragweed/rasm/isa.rb", "lib/ragweed/sbuf.rb", "lib/ragweed/trampoline.rb", "lib/ragweed/utils.rb", "lib/ragweed/wrap32.rb", "lib/ragweed/wrap32/debugging.rb", "lib/ragweed/wrap32/device.rb", "lib/ragweed/wrap32/event.rb", "lib/ragweed/wrap32/hooks.rb", "lib/ragweed/wrap32/overlapped.rb", "lib/ragweed/wrap32/process.rb", "lib/ragweed/wrap32/process_token.rb", "lib/ragweed/wrap32/thread_context.rb", "lib/ragweed/wrap32/winx.rb", "lib/ragweed/wrap32/wrap32.rb", "lib/ragweed/wraposx.rb", "lib/ragweed/wraposx/constants.rb", "lib/ragweed/wraposx/kernelerrorx.rb", "lib/ragweed/wraposx/region_info.rb", "lib/ragweed/wraposx/thread_context.rb", "lib/ragweed/wraposx/thread_info.rb", "lib/ragweed/wraposx/wraposx.rb", "lib/ragweed/wraptux.rb", "lib/ragweed/wraptux/constants.rb", "lib/ragweed/wraptux/threads.rb", "lib/ragweed/wraptux/wraptux.rb", "ragweed.gemspec", "spec/ragweed_spec.rb", "spec/spec_helper.rb",  "test/test_ragweed.rb"]
-  s.homepage = %q{http://github.com/tduehr/ragweed/tree/master}
-  s.rdoc_options = ["--inline-source", "--line-numbers", "--main", "README.txt"]
+  s.extra_rdoc_files = [
+    "README.rdoc",
+    "README.txt"
+  ]
+  s.files = [
+    "History.txt",
+    "README.rdoc",
+    "README.txt",
+    "Rakefile",
+    "VERSION",
+    "examples/hittracertux.rb",
+    "examples/hittracerx.rb",
+    "examples/hook_notepad.rb",
+    "examples/snicker.rb",
+    "examples/tux-example.rb",
+    "lib/.DS_Store",
+    "lib/ragweed.rb",
+    "lib/ragweed/arena.rb",
+    "lib/ragweed/blocks.rb",
+    "lib/ragweed/debugger32.rb",
+    "lib/ragweed/debuggerosx.rb",
+    "lib/ragweed/debuggertux.rb",
+    "lib/ragweed/detour.rb",
+    "lib/ragweed/ptr.rb",
+    "lib/ragweed/rasm.rb",
+    "lib/ragweed/rasm/bblock.rb",
+    "lib/ragweed/rasm/isa.rb",
+    "lib/ragweed/sbuf.rb",
+    "lib/ragweed/trampoline.rb",
+    "lib/ragweed/utils.rb",
+    "lib/ragweed/wrap32.rb",
+    "lib/ragweed/wrap32/debugging.rb",
+    "lib/ragweed/wrap32/device.rb",
+    "lib/ragweed/wrap32/event.rb",
+    "lib/ragweed/wrap32/hooks.rb",
+    "lib/ragweed/wrap32/overlapped.rb",
+    "lib/ragweed/wrap32/process.rb",
+    "lib/ragweed/wrap32/process_token.rb",
+    "lib/ragweed/wrap32/thread_context.rb",
+    "lib/ragweed/wrap32/winx.rb",
+    "lib/ragweed/wrap32/wrap32.rb",
+    "lib/ragweed/wraposx.rb",
+    "lib/ragweed/wraposx/constants.rb",
+    "lib/ragweed/wraposx/kernelerrorx.rb",
+    "lib/ragweed/wraposx/region_info.rb",
+    "lib/ragweed/wraposx/structs.rb",
+    "lib/ragweed/wraposx/thread_context.rb",
+    "lib/ragweed/wraposx/thread_info.rb",
+    "lib/ragweed/wraposx/thread_info.rb.old",
+    "lib/ragweed/wraposx/wraposx.rb",
+    "lib/ragweed/wraptux.rb",
+    "lib/ragweed/wraptux/constants.rb",
+    "lib/ragweed/wraptux/struct_helpers.rb",
+    "lib/ragweed/wraptux/threads.rb",
+    "lib/ragweed/wraptux/wraptux.rb",
+    "ragweed.gemspec",
+    "spec/ragweed_spec.rb",
+    "spec/spec_helper.rb",
+    "test/test_ragweed.rb"
+  ]
+  s.homepage = %q{http://github.com/tduehr/ragweed}
+  s.rdoc_options = ["--inline-source", "--line-numbers", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Scriptable debugger}
-  s.test_files = ["test/test_ragweed.rb"]
+  s.test_files = [
+    "examples/hittracertux.rb",
+    "examples/hittracerx.rb",
+    "examples/hook_notepad.rb",
+    "examples/snicker.rb",
+    "examples/tux-example.rb",
+    "spec/ragweed_spec.rb",
+    "spec/spec_helper.rb",
+    "test/test_ragweed.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bones>, [">= 2.5.1"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<ffi>, [">= 0"])
     else
-      s.add_dependency(%q<bones>, [">= 2.5.1"])
+      s.add_dependency(%q<ffi>, [">= 0"])
     end
   else
-    s.add_dependency(%q<bones>, [">= 2.5.1"])
+    s.add_dependency(%q<ffi>, [">= 0"])
   end
 end
+

metadata

@@ -1,27 +1,40 @@
 --- !ruby/object:Gem::Specification 
 name: ragweed
 version: !ruby/object:Gem::Version 
-  version: 0.1.7.3
+  hash: -1876988176
+  prerelease: true
+  segments: 
+  - 0
+  - 2
+  - 0
+  - pre1
+  version: 0.2.0.pre1
 platform: ruby
 authors: 
-- tduehr, tqbf, struct
+- tduehr
+- struct
+- tqbf
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-09-21 00:00:00 -05:00
+date: 2010-11-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: ffi
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.1
-    version: 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: General debugging tool written in Ruby for OSX/Win32/Linux
 email: td@matasano.com
 executables: []
@@ -29,7 +42,6 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
 - README.rdoc
 - README.txt
 files: 
@@ -37,11 +49,13 @@ files:
 - README.rdoc
 - README.txt
 - Rakefile
+- VERSION
 - examples/hittracertux.rb
 - examples/hittracerx.rb
 - examples/hook_notepad.rb
 - examples/snicker.rb
 - examples/tux-example.rb
+- lib/.DS_Store
 - lib/ragweed.rb
 - lib/ragweed/arena.rb
 - lib/ragweed/blocks.rb
@@ -71,11 +85,14 @@ files:
 - lib/ragweed/wraposx/constants.rb
 - lib/ragweed/wraposx/kernelerrorx.rb
 - lib/ragweed/wraposx/region_info.rb
+- lib/ragweed/wraposx/structs.rb
 - lib/ragweed/wraposx/thread_context.rb
 - lib/ragweed/wraposx/thread_info.rb
+- lib/ragweed/wraposx/thread_info.rb.old
 - lib/ragweed/wraposx/wraposx.rb
 - lib/ragweed/wraptux.rb
 - lib/ragweed/wraptux/constants.rb
+- lib/ragweed/wraptux/struct_helpers.rb
 - lib/ragweed/wraptux/threads.rb
 - lib/ragweed/wraptux/wraptux.rb
 - ragweed.gemspec
@@ -83,7 +100,7 @@ files:
 - spec/spec_helper.rb
 - test/test_ragweed.rb
 has_rdoc: true
-homepage: http://github.com/tduehr/ragweed/tree/master
+homepage: http://github.com/tduehr/ragweed
 licenses: []
 
 post_install_message: 
@@ -91,27 +108,42 @@ rdoc_options:
 - --inline-source
 - --line-numbers
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
-rubyforge_project: ""
-rubygems_version: 1.3.5
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Scriptable debugger
 test_files: 
+- examples/hittracertux.rb
+- examples/hittracerx.rb
+- examples/hook_notepad.rb
+- examples/snicker.rb
+- examples/tux-example.rb
+- spec/ragweed_spec.rb
+- spec/spec_helper.rb
 - test/test_ragweed.rb