Revert "Again improved LogReplaceLine"

This reverts commit dd325d742db9db54a25460fcacd093e7cc6f44f0.

src/Log.cpp

@@ -24,7 +24,8 @@
 cLog* cLog::s_Log = NULL;
 
 cLog::cLog(const AString & a_FileName )
-	: m_File(NULL)
+	: m_File(NULL),
+	m_LastStringSize(0)
 {
 	s_Log = this;
 
@@ -114,7 +115,6 @@ bool cLog::LogReplaceLine(const char * a_Format, va_list argList)
 	time(&rawtime);
 
 	struct tm* timeinfo;
-
 #ifdef _MSC_VER
 	struct tm timeinforeal;
 	timeinfo = &timeinforeal;
@@ -129,7 +129,6 @@ bool cLog::LogReplaceLine(const char * a_Format, va_list argList)
 #else
 	Printf(Line, "[%02d:%02d:%02d] %s", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, Message.c_str());
 #endif
-
 	if (m_File)
 	{
 		fprintf(m_File, "%s\n", Line.c_str());
@@ -142,57 +141,56 @@ bool cLog::LogReplaceLine(const char * a_Format, va_list argList)
 	__android_log_print(ANDROID_LOG_ERROR, "MCServer", "%s", Line.c_str());
 	//CallJavaFunction_Void_String(g_JavaThread, "AddToLog", Line );
 #else
-		
-		size_t LineLength = Line.length();
 #ifdef _WIN32
+	size_t LineLength = Line.length();
+
+	if (m_LastStringSize == 0)
+		m_LastStringSize = LineLength; // Initialise m_LastStringSize
+
 	HANDLE Output = GetStdHandle(STD_OUTPUT_HANDLE);
 
 	CONSOLE_SCREEN_BUFFER_INFO csbi;
-			GetConsoleScreenBufferInfo(Output, &csbi); // Obtain console window information
+	GetConsoleScreenBufferInfo(Output, &csbi);
 
-			if ((size_t)((csbi.srWindow.Right - csbi.srWindow.Left) + 1) < LineLength) // Will text overrun width? If so, do not do a replace operation
+	if ((size_t)((csbi.srWindow.Right - csbi.srWindow.Left) + 1) < LineLength)
 	{
-				printf("\n%s", Line.c_str()); // We are at line to be replaced, but since we can't, print normally with a newline
+		printf("\n%s", Line.c_str()); // We are at line to be replaced, but since we can't, add a new line
 		return false;
 	}
 
-			for (size_t X = 0; X != (size_t)(csbi.srWindow.Right - csbi.srWindow.Left); ++X)
+	if (LineLength < m_LastStringSize) // If last printed line was longer than current, clear this line
 	{
-				fputs(" ", stdout); // Clear current line in preparation for new text
+		for (size_t X = 0; X != m_LastStringSize + 1; ++X)
+		{
+			fputs(" ", stdout);
+		}
 	}
 #else // _WIN32
-			// Try to get console width; if text overruns, print normally with a newline
-			#ifdef TIOCGSIZE
 	struct ttysize ts;
+#ifdef TIOCGSIZE
 	ioctl(STDIN_FILENO, TIOCGSIZE, &ts);
-
 	if (ts.ts_cols < LineLength)
 	{
-					printf("\n%s", Line.c_str());
 		return false;
 	}
 #elif defined(TIOCGWINSZ)
-				struct winsize ts;
 	ioctl(STDIN_FILENO, TIOCGWINSZ, &ts);
-
+	if (ts.ts_cols < LineLength)
-				if (ts.ws_col < LineLength)
 	{
-					printf("\n%s", Line.c_str());
 		return false;
 	}
-			#else
+#else /* TIOCGSIZE */
-				printf("\n%s", Line.c_str());
 	return false;
 #endif
-
 	fputs("\033[K", stdout); // Clear current line
-		#endif // Not _WIN32
+#endif
-
 	printf("\r%s", Line.c_str());
-
 #ifdef __linux
 	fputs("\033[1B", stdout); // Move down one line
 #endif // __linux
+
+	m_LastStringSize = LineLength;
+
 #endif // ANDROID_NDK
 
 #if defined (_WIN32) && defined(_DEBUG)
@@ -243,9 +241,7 @@ void cLog::Log(const char * a_Format, va_list argList)
 	__android_log_print(ANDROID_LOG_ERROR, "MCServer", "%s", Line.c_str() );
 	//CallJavaFunction_Void_String(g_JavaThread, "AddToLog", Line );
 	#else
-	// If something requests the current line to be rewritten (LogReplaceLine), on Linux it clears the current line, but that moves the cursor to the end of that line, so we reset it here (\r)
+	printf("%s", Line.c_str());
-	// Doesn't affect anything normally - cursor should already be at beginning of line
-	printf("\r%s", Line.c_str());
 	#endif
 
 	#if defined (_WIN32) && defined(_DEBUG)

src/Log.h

@@ -11,6 +11,7 @@ private:
 
 	FILE * m_File;
 	static cLog * s_Log;
+	size_t m_LastStringSize;
 
 public: