From 5905ef3fadc18175e03d06bd97db121945b74848 Mon Sep 17 00:00:00 2001 From: Joshua Drake Date: Sun, 23 Oct 2011 12:04:41 +0000 Subject: [PATCH] msftidy pass on msf* git-svn-id: file:///home/svn/framework3/trunk@14035 4d416f70-5f16-0410-b530-b9f4589650da --- msfcli | 14 +++++++------- msfopcode | 4 ++-- msfrop | 2 +- msfupdate | 3 +++ 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/msfcli b/msfcli index dc467d7e9d..3d7b60f932 100755 --- a/msfcli +++ b/msfcli @@ -63,10 +63,10 @@ $stderr.puts "[*] Please wait while we load the module tree..." $framework = Msf::Simple::Framework.create if ($framework.modules.failed.length > 0) - print("Warning: The following modules could not be loaded!\n\n") - $framework.modules.failed.each_pair do |file, err| - print("\t#{file}: #{err}\n\n") - end + print("Warning: The following modules could not be loaded!\n\n") + $framework.modules.failed.each_pair do |file, err| + print("\t#{file}: #{err}\n\n") + end end if (not exploit_name) @@ -228,19 +228,19 @@ case mode.downcase con = Msf::Ui::Console::Driver.new( Msf::Ui::Console::Driver::DefaultPrompt, Msf::Ui::Console::Driver::DefaultPromptChar, - { + { 'Framework' => $framework } ) con.run_single("use #{module_class}/#{exploit.refname}") - + ARGV.each do |arg| k,v = arg.split("=", 2) con.run_single("set #{k} #{v}") end con.run_single("exploit") - + # If we have sessions or jobs, keep running if $framework.sessions.length > 0 or $framework.jobs.length > 0 con.run diff --git a/msfopcode b/msfopcode index 525cbb9795..4dc06040ae 100755 --- a/msfopcode +++ b/msfopcode @@ -235,8 +235,8 @@ case cmd "0x%.8x" % seg.base_address, seg.size.to_s, (((seg.readable == true) ? "r" : "") + - ((seg.writable == true) ? "w" : "") + - ((seg.executable == true) ? "x" : "")) + ((seg.writable == true) ? "w" : "") + + ((seg.executable == true) ? "x" : "")) ] } diff --git a/msfrop b/msfrop index 0e3ebed42f..b7a8cf609f 100755 --- a/msfrop +++ b/msfrop @@ -164,5 +164,5 @@ if opts[:export] puts "Error writing #{opts[:export]} file" exit(1) end - ropbuilder.print_msg("%bld%redSuccess!%clr gadgets exported to %bld%cya#{opts[:export]}%clr\n", color) + ropbuilder.print_msg("%bld%redSuccess!%clr gadgets exported to %bld%cya#{opts[:export]}%clr\n", color) end diff --git a/msfupdate b/msfupdate index 61e595bc6b..8858ccfa13 100755 --- a/msfupdate +++ b/msfupdate @@ -1,5 +1,8 @@ #!/usr/bin/env ruby +# $Id$ +# $Revision$ + msfbase = __FILE__ while File.symlink?(msfbase) msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))