This commit is contained in:
Miroslav Stampar 2015-10-12 10:05:49 +02:00
parent b9a44555ff
commit 48619d9ae1

View File

@ -77,7 +77,7 @@ def main():
errMsg = "your system does not properly handle non-ASCII paths. " errMsg = "your system does not properly handle non-ASCII paths. "
errMsg += "Please move the sqlmap's directory to the other location" errMsg += "Please move the sqlmap's directory to the other location"
logger.error(errMsg) logger.error(errMsg)
exit() raise SystemExit
setPaths() setPaths()
@ -122,7 +122,7 @@ def main():
except SqlmapBaseException as ex: except SqlmapBaseException as ex:
errMsg = getSafeExString(ex) errMsg = getSafeExString(ex)
logger.critical(errMsg) logger.critical(errMsg)
sys.exit(1) raise SystemExit
except KeyboardInterrupt: except KeyboardInterrupt:
print print
@ -142,6 +142,11 @@ def main():
errMsg = unhandledExceptionMessage() errMsg = unhandledExceptionMessage()
excMsg = traceback.format_exc() excMsg = traceback.format_exc()
if "No space left" in excMsg:
errMsg = "no space left on output device"
logger.error(errMsg)
raise SystemExit
for match in re.finditer(r'File "(.+?)", line', excMsg): for match in re.finditer(r'File "(.+?)", line', excMsg):
file_ = match.group(1) file_ = match.group(1)
file_ = os.path.relpath(file_, os.path.dirname(__file__)) file_ = os.path.relpath(file_, os.path.dirname(__file__))