cleanup patch from antoine

git-svn-id: file:///home/svn/framework3/trunk@5748 4d416f70-5f16-0410-b530-b9f4589650da
unstable
HD Moore 2008-10-13 14:22:38 +00:00
parent 27f4322366
commit e016ff2d76
3 changed files with 9 additions and 34 deletions

View File

@ -37,14 +37,6 @@ module Exploit::Capture
@pcaprub_error = e
end
begin
require 'scruby'
@scruby_loaded = true
rescue ::Exception => e
@scruby_loaded = false
@scruby_error = e
end
end
def stats_recv

View File

@ -15,32 +15,16 @@ module FileUtils
# a fully qualified path to the supplied file name.
#
def self.find_full_path(file_name)
case RUBY_PLATFORM
when /mswin32/
if (ENV['PATH'])
ENV['PATH'].split(';').each { |base|
begin
path = base + ::File::SEPARATOR + file_name
if (::File::Stat.new(path))
return path
end
rescue
if (ENV['PATH'])
ENV['PATH'].split(::File::PATH_SEPARATOR).each { |base|
begin
path = base + ::File::SEPARATOR + file_name
if (::File::Stat.new(path))
return path
end
}
end
else
if (ENV['PATH'])
ENV['PATH'].split(':').each { |base|
begin
path = base + ::File::SEPARATOR + file_name
if (::File::Stat.new(path))
return path
end
rescue
end
}
end
rescue
end
}
end
return nil
end

View File

@ -1,6 +1,5 @@
require 'msf/core'
require 'net/dns'
require 'scruby'
require 'resolv'