From 9428d1819ed95015d428caf44acd6bef4bcb310a Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Thu, 17 Jan 2013 12:03:02 +0100
Subject: [PATCH] Fix for an Issue #346

---
 lib/core/common.py | 2 +-
 lib/core/option.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/core/common.py b/lib/core/common.py
index e424001c7..9abcf3448 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -917,7 +917,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 = os.path.join(paths.SQLMAP_ROOT_PATH, "output")
+    paths.SQLMAP_OUTPUT_PATH = paths.get("SQLMAP_OUTPUT_PATH", os.path.join(paths.SQLMAP_ROOT_PATH, "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/option.py b/lib/core/option.py
index 4d12b49ec..b3844f6d5 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -48,6 +48,7 @@ from lib.core.common import resetCookieJar
 from lib.core.common import runningAsAdmin
 from lib.core.common import sanitizeStr
 from lib.core.common import setOptimize
+from lib.core.common import setPaths
 from lib.core.common import singleTimeWarnMessage
 from lib.core.common import UnicodeRawConfigParser
 from lib.core.common import urldecode
@@ -1420,6 +1421,7 @@ def _cleanupOptions():
 
     if conf.oDir:
         paths.SQLMAP_OUTPUT_PATH = conf.oDir
+        setPaths()
 
     if conf.string:
         try: