sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-03-23 19:34:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

another consistency fix to readInput()

Browse Source
This commit is contained in:
Bernardo Damele 2013-02-15 09:35:09 +00:00
parent 32c8c67888
commit b472d9809a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/core/common.py
View File

@ -853,8 +853,7 @@ def readInput(message, default=None, checkBatch=True):
else: else:
options = unicode() options = unicode()
infoMsg = "%s%s" % (getUnicode(message), options) dataToStdout("\r%s%s" % (getUnicode(message), options), forceOutput=True, bold=True)
logger.info(infoMsg)
debugMsg = "used the default behaviour, running in batch mode" debugMsg = "used the default behaviour, running in batch mode"
logger.debug(debugMsg) logger.debug(debugMsg)
@ -864,6 +863,7 @@ def readInput(message, default=None, checkBatch=True):
logging._acquireLock() logging._acquireLock()
dataToStdout("\r%s" % message, forceOutput=True, bold=True) dataToStdout("\r%s" % message, forceOutput=True, bold=True)
kb.prependFlag = False kb.prependFlag = False
try: try:
retVal = raw_input() or default retVal = raw_input() or default
retVal = getUnicode(retVal, system=True) if retVal else retVal retVal = getUnicode(retVal, system=True) if retVal else retVal
@ -871,6 +871,7 @@ def readInput(message, default=None, checkBatch=True):
time.sleep(0.05) # Reference: http://www.gossamer-threads.com/lists/python/python/781893 time.sleep(0.05) # Reference: http://www.gossamer-threads.com/lists/python/python/781893
kb.prependFlag = True kb.prependFlag = True
raise SqlmapUserQuitException raise SqlmapUserQuitException
finally: finally:
logging._releaseLock() logging._releaseLock()