bugs bugs, messing with win32

git-svn-id: file:///home/svn/incoming/trunk@3016 4d416f70-5f16-0410-b530-b9f4589650da

documentation/bugs

@@ -7,3 +7,12 @@ meterpreter
 
 msfconsole
   - jobs -k on the same exploit twice leads to exception
+
+
+win32 bugs
+
+  - 'gets' blocks
+    - http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/151367
+	   - works in cmd.exe
+		- does not work in rxvt (kbhit just keeps returning 0)
+X - no HOME variable by default -- need to use another directory 

lib/msf/base/config.rb

@@ -15,13 +15,24 @@ class Config < Hash
 	#
 	InstallRoot = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
+	#
+	# Determines the base configuration directory.
+	#
+	def self.get_config_root
+		begin
+			File.expand_path("~#{FileSep}.msf3")
+		rescue ArgumentError
+			InstallRoot + ".msf3"
+		end
+	end
+
 	#
 	# Default values
 	#
 	FileSep     = File::SEPARATOR
 	Defaults    =
 		{
-			'ConfigDirectory'     => File.expand_path("~#{FileSep}.msf3"),
+			'ConfigDirectory'     => get_config_root,
 			'ConfigFile'          => "config",
 			'ModuleDirectory'     => "modules",
 			'LogDirectory'        => "logs",

lib/rex/ui/text/shell.rb

@@ -171,7 +171,11 @@ module Shell
 	# console
 	#
 	def supports_color?
-		return (ENV['TERM'].match(/(?:vt10[03]|xterm(?:-color)?|linux|screen)/i) != nil)
+		begin
+			(ENV['TERM'].match(/(?:vt10[03]|xterm(?:-color)?|linux|screen)/i) != nil)
+		rescue
+			false
+		end
 	end
 
 	#