From b481c0352fe57b8ee10320bba2183da41a953968 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 24 Feb 2012 11:25:56 +0000 Subject: [PATCH] minor update --- lib/core/common.py | 2 +- lib/techniques/blind/inference.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index 24768ecd1..83a0a3113 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -734,7 +734,7 @@ def dataToStdout(data, forceOutput=False): sys.stdout.flush() if kb.get("multiThreadMode"): logging._releaseLock() - setFormatterPrependFlag(len(data) == 1 and data != '\n') + setFormatterPrependFlag(len(data) == 1 and data != '\n' or len(data) > 2 and data[0] == '\r' and data[-1] != '\n') def dataToSessionFile(data): if not conf.sessionFile or kb.suppressSession: diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py index c625b2656..127ccdb16 100644 --- a/lib/techniques/blind/inference.py +++ b/lib/techniques/blind/inference.py @@ -137,7 +137,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None dataToStdout("[%s] [INFO] retrieved: %s" % (time.strftime("%X"), "_" * min(length, conf.progressWidth))) dataToStdout("\r[%s] [INFO] retrieved: " % time.strftime("%X")) else: - dataToStdout("[%s] [INFO] retrieved: " % time.strftime("%X")) + dataToStdout("\r[%s] [INFO] retrieved: " % time.strftime("%X")) hintlock = threading.Lock() @@ -320,8 +320,6 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None progress.update(index) progress.draw(eta) - setFormatterPrependFlag(True) - # Go multi-threading (--threads > 1) if conf.threads > 1 and isinstance(length, int) and length > 1: value = []