From 984943ee3c579443eb5821b4bd405ebcc5687bbc Mon Sep 17 00:00:00 2001
From: Alexander Rigbo <alex@dnb.nu>
Date: Tue, 26 Jun 2012 23:03:27 +0200
Subject: [PATCH] Add command line option --result-file

---
 lib/core/optiondict.py | 1 +
 lib/core/target.py     | 6 +++++-
 lib/parse/cmdline.py   | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
index 172877802..f3d420f2c 100644
--- a/lib/core/optiondict.py
+++ b/lib/core/optiondict.py
@@ -173,6 +173,7 @@ optDict = {
                                "flushSession":      "boolean",
                                "forms":             "boolean",
                                "freshQueries":      "boolean",
+                               "rfmt":              "string",
                                "hexConvert":        "boolean",
                                "parseErrors":       "boolean",
                                "replicate":         "boolean",
diff --git a/lib/core/target.py b/lib/core/target.py
index 61a52f8f3..ee0b275bd 100644
--- a/lib/core/target.py
+++ b/lib/core/target.py
@@ -328,7 +328,11 @@ def __setResultsFile():
         return
 
     if not conf.resultsFP:
-        conf.resultsFilename = "%s%s%s" % (paths.SQLMAP_OUTPUT_PATH, os.sep, time.strftime(RESULTS_FILE_FORMAT).lower())
+        if conf.rfmt:
+            conf.resultsFilename = "%s%s%s" % (paths.SQLMAP_OUTPUT_PATH, os.sep, conf.rfmt)
+        else:
+            conf.resultsFilename = "%s%s%s" % (paths.SQLMAP_OUTPUT_PATH, os.sep, time.strftime(RESULTS_FILE_FORMAT).lower())
+
         conf.resultsFP = codecs.open(conf.resultsFilename, "w+", UNICODE_ENCODING)
         conf.resultsFP.writelines("Target url,Place,Parameter,Techniques%s" % os.linesep)
 
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index 63dd6f737..2b42e962d 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -535,6 +535,9 @@ def cmdLineParser():
                             action="store_true",
                             help="Ignores query results stored in session file")
 
+        general.add_option("--result-file", dest="rfmt",
+                              help="Result file name (time.strftime format string)")
+
         general.add_option("--hex", dest="hexConvert",
                             action="store_true",
                             help="Uses DBMS hex function(s) for data retrieval")