From 1eecabaea812d7d903e0a9af5d681417ba24d412 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Wed, 2 Jul 2014 10:09:19 +0200
Subject: [PATCH] Patch for an Issue #746

---
 lib/core/common.py |  2 +-
 lib/core/target.py | 26 +++++++++++---------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/lib/core/common.py b/lib/core/common.py
index 317893215..32ba4d903 100755
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -1043,7 +1043,7 @@ def setPaths():
     paths.SQLMAP_UDF_PATH = os.path.join(paths.SQLMAP_ROOT_PATH, "udf")
     paths.SQLMAP_XML_PATH = os.path.join(paths.SQLMAP_ROOT_PATH, "xml")
     paths.SQLMAP_XML_BANNER_PATH = os.path.join(paths.SQLMAP_XML_PATH, "banner")
-    paths.SQLMAP_OUTPUT_PATH = paths.get("SQLMAP_OUTPUT_PATH", os.path.join(paths.SQLMAP_ROOT_PATH, "output"))
+    paths.SQLMAP_OUTPUT_PATH = paths.get("SQLMAP_OUTPUT_PATH", os.path.join(os.path.expanduser("~"), ".sqlmap", "output"))
 
     paths.SQLMAP_DUMP_PATH = os.path.join(paths.SQLMAP_OUTPUT_PATH, "%s", "dump")
     paths.SQLMAP_FILES_PATH = os.path.join(paths.SQLMAP_OUTPUT_PATH, "%s", "files")
diff --git a/lib/core/target.py b/lib/core/target.py
index d4dddc393..25b5adb97 100644
--- a/lib/core/target.py
+++ b/lib/core/target.py
@@ -512,22 +512,18 @@ def _createTargetDirs():
 
     if not os.path.isdir(paths.SQLMAP_OUTPUT_PATH):
         try:
-            os.makedirs(paths.SQLMAP_OUTPUT_PATH, 0755)
-        except OSError, ex:
-            paths.SQLMAP_OUTPUT_PATH = os.path.join(os.path.expanduser("~"), ".sqlmap", "output")
-            try:
-                if not os.path.isdir(paths.SQLMAP_OUTPUT_PATH):
-                    os.makedirs(paths.SQLMAP_OUTPUT_PATH, 0755)
-                warnMsg = "using '%s' as the output directory" % paths.SQLMAP_OUTPUT_PATH
-                logger.warn(warnMsg)
-            except OSError, ex:    
-                tempDir = tempfile.mkdtemp(prefix="sqlmapoutput")
-                warnMsg = "unable to create regular output directory "
-                warnMsg += "'%s' (%s). " % (paths.SQLMAP_OUTPUT_PATH, ex)
-                warnMsg += "Using temporary directory '%s' instead" % tempDir
-                logger.warn(warnMsg)
+            if not os.path.isdir(paths.SQLMAP_OUTPUT_PATH):
+                os.makedirs(paths.SQLMAP_OUTPUT_PATH, 0755)
+            warnMsg = "using '%s' as the output directory" % paths.SQLMAP_OUTPUT_PATH
+            logger.warn(warnMsg)
+        except OSError, ex:    
+            tempDir = tempfile.mkdtemp(prefix="sqlmapoutput")
+            warnMsg = "unable to create regular output directory "
+            warnMsg += "'%s' (%s). " % (paths.SQLMAP_OUTPUT_PATH, ex)
+            warnMsg += "Using temporary directory '%s' instead" % tempDir
+            logger.warn(warnMsg)
 
-                paths.SQLMAP_OUTPUT_PATH = tempDir
+            paths.SQLMAP_OUTPUT_PATH = tempDir
 
     conf.outputPath = os.path.join(paths.SQLMAP_OUTPUT_PATH, getUnicode(conf.hostname))