7 files changed, 69 insertions, 16 deletions

diff --git a/src/OSSupport/CMakeLists.txt b/src/OSSupport/CMakeLists.txt
index a42fcbed4..429949c59 100644
--- a/src/OSSupport/CMakeLists.txt
+++ b/src/OSSupport/CMakeLists.txt
@@ -39,6 +39,6 @@ if(NOT MSVC)
 	add_library(OSSupport ${SRCS} ${HDRS})
 
 	if(UNIX)
-		target_link_libraries(OSSupport pthread)
+		target_link_libraries(OSSupport pthread rt)
 	endif()
 endif()
diff --git a/src/OSSupport/Event.cpp b/src/OSSupport/Event.cpp
index 74f823216..7cf8a826c 100644
--- a/src/OSSupport/Event.cpp
+++ b/src/OSSupport/Event.cpp
@@ -102,6 +102,53 @@ void cEvent::Wait(void)
 
 
 
+bool cEvent::Wait(int a_TimeoutMSec)
+{
+	#ifdef _WIN32
+		DWORD res = WaitForSingleObject(m_Event, (DWORD)a_TimeoutMSec);
+		switch (res)
+		{
+			case WAIT_OBJECT_0: return true;   // Regular event signalled
+			case WAIT_TIMEOUT:  return false;  // Regular event timeout
+			default:
+			{
+				LOGWARN("cEvent: waiting for the event failed: %u, GLE = %u. Continuing, but server may be unstable.", (unsigned)res, (unsigned)GetLastError());
+				return false;
+			}
+		}
+	#else
+		// Get the current time:
+		timespec timeout;
+		if (clock_gettime(CLOCK_REALTIME, &timeout) == -1)
+		{
+			LOGWARN("cEvent: Getting current time failed: %i, err = %s. Continuing, but the server may be unstable.", errno, GetOSErrorString(errno).c_str());
+			return false;
+		}
+
+		// Add the specified timeout:
+		timeout.tv_sec += a_TimeoutMSec / 1000;
+		timeout.tv_nsec += (a_TimeoutMSec % 1000) * 1000000;  // 1 msec = 1000000 usec
+
+		// Wait with timeout:
+		int res = sem_timedwait(m_Event, &timeout);
+		switch (res)
+		{
+			case 0:         return true;   // Regular event signalled
+			case ETIMEDOUT: return false;  // Regular even timeout
+			default:
+			{
+				AString error = GetOSErrorString(errno);
+				LOGWARN("cEvent: waiting for the event failed: %i, err = %s. Continuing, but server may be unstable.", res, error.c_str());
+				return false;
+			}
+		}
+	#endif
+}
+
+
+
+
+
 void cEvent::Set(void)
 {
 	#ifdef _WIN32
diff --git a/src/OSSupport/Event.h b/src/OSSupport/Event.h
index 71f418c0c..e2fa65a05 100644
--- a/src/OSSupport/Event.h
+++ b/src/OSSupport/Event.h
@@ -24,6 +24,10 @@ public:
 
 	void Wait(void);
 	void Set (void);
+
+	/** Waits for the event until either it is signalled, or the (relative) timeout is passed.
+	Returns true if the event was signalled, false if the timeout was hit or there was an error. */
+	bool Wait(int a_TimeoutMSec);
 	
 private:
 
diff --git a/src/OSSupport/File.cpp b/src/OSSupport/File.cpp
index ff6fb5898..cb6031da6 100644
--- a/src/OSSupport/File.cpp
+++ b/src/OSSupport/File.cpp
@@ -70,6 +70,7 @@ bool cFile::Open(const AString & iFileName, eMode iMode)
 		case fmRead:      Mode = "rb";  break;
 		case fmWrite:     Mode = "wb";  break;
 		case fmReadWrite: Mode = "rb+"; break;
+		case fmAppend:    Mode = "a+";  break;
 	}
 	if (Mode == NULL)
 	{
@@ -255,10 +256,10 @@ int cFile::ReadRestOfFile(AString & a_Contents)
 		return -1;
 	}
 	
-	int DataSize = GetSize() - Tell();
+	size_t DataSize = GetSize() - Tell();
 	
 	// HACK: This depends on the internal knowledge that AString's data() function returns the internal buffer directly
-	a_Contents.assign((size_t)DataSize, '\0');
+	a_Contents.assign(DataSize, '\0');
 	return Read((void *)a_Contents.data(), DataSize);
 }
 
@@ -297,7 +298,7 @@ bool cFile::Rename(const AString & a_OrigFileName, const AString & a_NewFileName
 bool cFile::Copy(const AString & a_SrcFileName, const AString & a_DstFileName)
 {
 	#ifdef _WIN32
-		return (CopyFile(a_SrcFileName.c_str(), a_DstFileName.c_str(), true) != 0);
+		return (CopyFileA(a_SrcFileName.c_str(), a_DstFileName.c_str(), true) != 0);
 	#else
 		// Other OSs don't have a direct CopyFile equivalent, do it the harder way:
 		std::ifstream src(a_SrcFileName.c_str(), std::ios::binary);
@@ -321,7 +322,7 @@ bool cFile::Copy(const AString & a_SrcFileName, const AString & a_DstFileName)
 bool cFile::IsFolder(const AString & a_Path)
 {
 	#ifdef _WIN32
-		DWORD FileAttrib = GetFileAttributes(a_Path.c_str());
+		DWORD FileAttrib = GetFileAttributesA(a_Path.c_str());
 		return ((FileAttrib != INVALID_FILE_ATTRIBUTES) && ((FileAttrib & FILE_ATTRIBUTE_DIRECTORY) != 0));
 	#else
 		struct stat st;
@@ -336,7 +337,7 @@ bool cFile::IsFolder(const AString & a_Path)
 bool cFile::IsFile(const AString & a_Path)
 {
 	#ifdef _WIN32
-		DWORD FileAttrib = GetFileAttributes(a_Path.c_str());
+		DWORD FileAttrib = GetFileAttributesA(a_Path.c_str());
 		return ((FileAttrib != INVALID_FILE_ATTRIBUTES) && ((FileAttrib & (FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_DEVICE)) == 0));
 	#else
 		struct stat st;
@@ -365,7 +366,7 @@ int cFile::GetSize(const AString & a_FileName)
 bool cFile::CreateFolder(const AString & a_FolderPath)
 {
 	#ifdef _WIN32
-		return (CreateDirectory(a_FolderPath.c_str(), NULL) != 0);
+		return (CreateDirectoryA(a_FolderPath.c_str(), NULL) != 0);
 	#else
 		return (mkdir(a_FolderPath.c_str(), S_IRWXU | S_IRWXG | S_IRWXO) == 0);
 	#endif
@@ -395,13 +396,13 @@ AStringVector cFile::GetFolderContents(const AString & a_Folder)
 	// Find all files / folders:
 	FileFilter.append("*.*");
 	HANDLE hFind;
-	WIN32_FIND_DATA FindFileData;
-	if ((hFind = FindFirstFile(FileFilter.c_str(), &FindFileData)) != INVALID_HANDLE_VALUE)
+	WIN32_FIND_DATAA FindFileData;
+	if ((hFind = FindFirstFileA(FileFilter.c_str(), &FindFileData)) != INVALID_HANDLE_VALUE)
 	{
 		do
 		{
 			AllFiles.push_back(FindFileData.cFileName);
-		} while (FindNextFile(hFind, &FindFileData));
+		} while (FindNextFileA(hFind, &FindFileData));
 		FindClose(hFind);
 	}
 	
@@ -459,7 +460,7 @@ int cFile::Printf(const char * a_Fmt, ...)
 	va_start(args, a_Fmt);
 	AppendVPrintf(buf, a_Fmt, args);
 	va_end(args);
-	return Write(buf.c_str(), (int)buf.length());
+	return Write(buf.c_str(), buf.length());
 }
 
 
diff --git a/src/OSSupport/File.h b/src/OSSupport/File.h
index 2a7ecf0ed..dfb38e839 100644
--- a/src/OSSupport/File.h
+++ b/src/OSSupport/File.h
@@ -60,9 +60,10 @@ public:
 	/** The mode in which to open the file */
 	enum eMode
 	{
-		fmRead,      // Read-only. If the file doesn't exist, object will not be valid
-		fmWrite,     // Write-only. If the file already exists, it will be overwritten
-		fmReadWrite  // Read/write. If the file already exists, it will be left intact; writing will overwrite the data from the beginning
+		fmRead,       // Read-only. If the file doesn't exist, object will not be valid
+		fmWrite,      // Write-only. If the file already exists, it will be overwritten
+		fmReadWrite,  // Read/write. If the file already exists, it will be left intact; writing will overwrite the data from the beginning
+		fmAppend      // Write-only. If the file already exists cursor will be moved to the end of the file
 	} ;
 	
 	/** Simple constructor - creates an unopened file object, use Open() to open / create a real file */
diff --git a/src/OSSupport/IsThread.h b/src/OSSupport/IsThread.h
index c20fc3e7e..5de5f31c4 100644
--- a/src/OSSupport/IsThread.h
+++ b/src/OSSupport/IsThread.h
@@ -69,7 +69,7 @@ protected:
 		static DWORD __stdcall thrExecute(LPVOID a_Param)
 		{
 			// Create a window so that the thread can be identified by 3rd party tools:
-			HWND IdentificationWnd = CreateWindow("STATIC", ((cIsThread *)a_Param)->m_ThreadName.c_str(), 0, 0, 0, 0, WS_OVERLAPPED, NULL, NULL, NULL, NULL);
+			HWND IdentificationWnd = CreateWindowA("STATIC", ((cIsThread *)a_Param)->m_ThreadName.c_str(), 0, 0, 0, 0, WS_OVERLAPPED, NULL, NULL, NULL, NULL);
 			
 			// Run the thread:
 			((cIsThread *)a_Param)->Execute();
diff --git a/src/OSSupport/Queue.h b/src/OSSupport/Queue.h
index bf4d7f004..8d096fe29 100644
--- a/src/OSSupport/Queue.h
+++ b/src/OSSupport/Queue.h
@@ -20,7 +20,7 @@ cQueueFuncs and is used as the default behavior.
 */
 
 /// This empty struct allows for the callback functions to be inlined
-template<class T>
+template <class T>
 struct cQueueFuncs
 {
 public: