2 files changed, 80 insertions, 77 deletions

diff --git a/src/Log.cpp b/src/Log.cpp
index aa9f22f84..a1b4c784f 100644
--- a/src/Log.cpp
+++ b/src/Log.cpp
@@ -9,7 +9,7 @@
 
 #ifdef __linux
 #include <sys/ioctl.h>
-#include <unistd.h>  
+#include <unistd.h>
 #endif // __linux
 
 
@@ -24,8 +24,7 @@
 cLog* cLog::s_Log = NULL;
 
 cLog::cLog(const AString & a_FileName )
-	: m_File(NULL),
-	m_LastStringSize(0)
+	: m_File(NULL)
 {
 	s_Log = this;
 
@@ -115,20 +114,22 @@ bool cLog::LogReplaceLine(const char * a_Format, va_list argList)
 	time(&rawtime);
 
 	struct tm* timeinfo;
-#ifdef _MSC_VER
-	struct tm timeinforeal;
-	timeinfo = &timeinforeal;
-	localtime_s(timeinfo, &rawtime);
-#else
-	timeinfo = localtime(&rawtime);
-#endif
+
+	#ifdef _MSC_VER
+		struct tm timeinforeal;
+		timeinfo = &timeinforeal;
+		localtime_s(timeinfo, &rawtime);
+	#else
+		timeinfo = localtime(&rawtime);
+	#endif
 
 	AString Line;
-#ifdef _DEBUG
-	Printf(Line, "[%04x|%02d:%02d:%02d] %s", cIsThread::GetCurrentID(), timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, Message.c_str());
-#else
-	Printf(Line, "[%02d:%02d:%02d] %s", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, Message.c_str());
-#endif
+	#ifdef _DEBUG
+		Printf(Line, "[%04x|%02d:%02d:%02d] %s", cIsThread::GetCurrentID(), timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, Message.c_str());
+	#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());
@@ -136,67 +137,68 @@ bool cLog::LogReplaceLine(const char * a_Format, va_list argList)
 	}
 
 	// Print to console:
-#if defined(ANDROID_NDK)
-	//__android_log_vprint(ANDROID_LOG_ERROR,"MCServer", a_Format, argList);
-	__android_log_print(ANDROID_LOG_ERROR, "MCServer", "%s", Line.c_str());
-	//CallJavaFunction_Void_String(g_JavaThread, "AddToLog", Line );
-#else
-#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);
-
-	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, add a new line
-		return false;
-	}
-
-	if (LineLength < m_LastStringSize) // If last printed line was longer than current, clear this line
-	{
-		for (size_t X = 0; X != m_LastStringSize + 1; ++X)
-		{
-			fputs(" ", stdout);
-		}
-	}
-#else // _WIN32
-	struct ttysize ts;
-#ifdef TIOCGSIZE
-	ioctl(STDIN_FILENO, TIOCGSIZE, &ts);
-	if (ts.ts_cols < LineLength)
-	{
-		return false;
-	}
-#elif defined(TIOCGWINSZ)
-	ioctl(STDIN_FILENO, TIOCGWINSZ, &ts);
-	if (ts.ts_cols < LineLength)
-	{
-		return false;
-	}
-#else /* TIOCGSIZE */
-	return false;
-#endif
-	fputs("\033[K", stdout); // Clear current line
-#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(ANDROID_NDK)
+		//__android_log_vprint(ANDROID_LOG_ERROR,"MCServer", a_Format, 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
+			HANDLE Output = GetStdHandle(STD_OUTPUT_HANDLE);
+
+			CONSOLE_SCREEN_BUFFER_INFO csbi;
+			GetConsoleScreenBufferInfo(Output, &csbi); // Obtain console window information
+
+			if ((size_t)((csbi.srWindow.Right - csbi.srWindow.Left) + 1) < LineLength) // Will text overrun width? If so, do not do a replace operation
+			{
+				printf("\n%s", Line.c_str()); // We are at line to be replaced, but since we can't, print normally with a newline
+				return false;
+			}
+
+			for (size_t X = 0; X != (size_t)(csbi.srWindow.Right - csbi.srWindow.Left); ++X)
+			{
+				fputs(" ", stdout); // Clear current line in preparation for new text
+			}
+		#else // _WIN32
+			// Try to get console width; if text overruns, print normally with a newline
+			#ifdef TIOCGSIZE
+				struct ttysize ts;
+				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.ws_col < LineLength)
+				{
+					printf("\n%s", Line.c_str());
+					return false;
+				}
+			#else
+				printf("\n%s", Line.c_str());
+				return false;
+			#endif
+
+			fputs("\033[K", stdout); // Clear current line
+		#endif // Not _WIN32
+
+		printf("\r%s", Line.c_str());
+
+		#ifdef __linux
+			fputs("\033[1B", stdout); // Move down one line
+		#endif // __linux
+	#endif // ANDROID_NDK
 
-#if defined (_WIN32) && defined(_DEBUG)
-	// In a Windows Debug build, output the log to debug console as well:
-	OutputDebugStringA((Line + "\n").c_str());
-#endif  // _WIN32
+	#if defined (_WIN32) && defined(_DEBUG)
+		// In a Windows Debug build, output the log to debug console as well:
+		OutputDebugStringA((Line + "\n").c_str());
+	#endif  // _WIN32
 
 	return true;
 }
@@ -241,7 +243,9 @@ 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
-	printf("%s", Line.c_str());
+	// 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)
+	// 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)
diff --git a/src/Log.h b/src/Log.h
index c9ca17864..6944edd88 100644
--- a/src/Log.h
+++ b/src/Log.h
@@ -11,7 +11,6 @@ private:
 
 	FILE * m_File;
 	static cLog * s_Log;
-	size_t m_LastStringSize;
 
 public: