From 02bd9a54f30a9db8f6cbb85f4001495e350e5fba Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Wed, 30 Nov 2011 17:19:21 +0000
Subject: [PATCH] minor update

---
 lib/core/common.py   | 3 ++-
 lib/core/dump.py     | 5 +++--
 lib/core/settings.py | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/core/common.py b/lib/core/common.py
index 35f220256..820ffb5aa 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -79,6 +79,7 @@ from lib.core.settings import DEFAULT_GET_POST_DELIMITER
 from lib.core.settings import INFERENCE_UNKNOWN_CHAR
 from lib.core.settings import UNICODE_ENCODING
 from lib.core.settings import DBMS_DICT
+from lib.core.settings import DEFAULT_CSV_DELIMITER
 from lib.core.settings import DESCRIPTION
 from lib.core.settings import DUMMY_SQL_INJECTION_CHARS
 from lib.core.settings import IS_WIN
@@ -2988,7 +2989,7 @@ def safeCSValue(value):
 
     if retVal and isinstance(retVal, basestring):
         if not (retVal[0] == retVal[-1] == '"'):
-            if any(map(lambda x: x in retVal, ['"', ',', '\n'])):
+            if any(map(lambda x: x in retVal, [DEFAULT_CSV_DELIMITER, '"', '\n'])):
                 retVal = '"%s"' % retVal.replace('"', '""')
 
     return retVal
diff --git a/lib/core/dump.py b/lib/core/dump.py
index cc30e2d70..0b7b8b03b 100644
--- a/lib/core/dump.py
+++ b/lib/core/dump.py
@@ -24,6 +24,7 @@ from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.enums import DBMS
 from lib.core.replication import Replication
+from lib.core.settings import DEFAULT_CSV_DELIMITER
 from lib.core.settings import TRIM_STDOUT_DUMP_SIZE
 from lib.core.settings import UNICODE_ENCODING
 
@@ -397,7 +398,7 @@ class Dump:
                     if field == fields:
                         dataToDumpFile(dumpFP, "%s" % safeCSValue(column))
                     else:
-                        dataToDumpFile(dumpFP, "%s," % safeCSValue(column))
+                        dataToDumpFile(dumpFP, "%s%s" % (safeCSValue(column), DEFAULT_CSV_DELIMITER))
 
                 field += 1
 
@@ -443,7 +444,7 @@ class Dump:
                         if field == fields:
                             dataToDumpFile(dumpFP, "%s" % safeCSValue(value))
                         else:
-                            dataToDumpFile(dumpFP, "%s," % safeCSValue(value))
+                            dataToDumpFile(dumpFP, "%s%s" % (safeCSValue(value), DEFAULT_CSV_DELIMITER))
 
                     field += 1
 
diff --git a/lib/core/settings.py b/lib/core/settings.py
index e2a4d1000..6c0cb3d72 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -413,6 +413,9 @@ UNENCODED_ORIGINAL_VALUE = 'original'
 # Common column names containing usernames (used for hash cracking in some cases)
 COMMON_USER_COLUMNS = ('user', 'username', 'user_name', 'benutzername', 'benutzer', 'utilisateur', 'usager', 'consommateur', 'utente', 'utilizzatore', 'usufrutuario', 'korisnik', 'usuario', 'consumidor')
 
+# Default delimiter used in CSV file format
+DEFAULT_CSV_DELIMITER = ','
+
 # Default delimiter in GET/POST values
 DEFAULT_GET_POST_DELIMITER = '&'