Fix tests (hopefully) on Win32 for struct stat ino_t change from 16 to

64 bits.

2 files changed, 39 insertions, 183 deletions

diff --git a/lib/win32/emu.cpp b/lib/win32/emu.cpp
index 189bf587..ad8c3041 100644
--- a/lib/win32/emu.cpp
+++ b/lib/win32/emu.cpp
@@ -21,149 +21,9 @@
 #include <sstream>
 
 // message resource definitions for syslog()
-
 #include "messages.h"
 
-// our implementation for a timer, based on a 
-// simple thread which sleeps for a period of time
-
-static bool gTimerInitialised = false;
-static bool gFinishTimer;
-static CRITICAL_SECTION gLock;
-
 DWORD winerrno;
-
-typedef struct 
-{
-	int countDown;
-	int interval;
-}
-Timer_t;
-
-std::list<Timer_t> gTimerList;
-static void (__cdecl *gTimerFunc) (int) = NULL;
-
-int setitimer(int type, struct itimerval *timeout, void *arg)
-{
-	assert(gTimerInitialised);
-	
-	if (ITIMER_REAL != type)
-	{
-		errno = ENOSYS;
-		return -1;
-	}
-
-	EnterCriticalSection(&gLock);
-
-	// we only need seconds for the mo!
-	if (timeout->it_value.tv_sec  == 0 && 
-	    timeout->it_value.tv_usec == 0)
-	{
-		gTimerList.clear();
-	}
-	else
-	{
-		Timer_t ourTimer;
-		ourTimer.countDown = timeout->it_value.tv_sec;
-		ourTimer.interval  = timeout->it_interval.tv_sec;
-		gTimerList.push_back(ourTimer);
-	}
-
-	LeaveCriticalSection(&gLock);
-	
-	// indicate success
-	return 0;
-}
-
-static unsigned int WINAPI RunTimer(LPVOID lpParameter)
-{
-	gFinishTimer = false;
-
-	while (!gFinishTimer)
-	{
-		std::list<Timer_t>::iterator it;
-		EnterCriticalSection(&gLock);
-
-		for (it = gTimerList.begin(); it != gTimerList.end(); it++)
-		{
-			Timer_t& rTimer(*it);
-
-			rTimer.countDown --;
-			if (rTimer.countDown == 0)
-			{
-				if (gTimerFunc != NULL)
-				{
-					gTimerFunc(0);
-				}
-				if (rTimer.interval)
-				{
-					rTimer.countDown = rTimer.interval;
-				}
-				else
-				{
-					// mark for deletion
-					rTimer.countDown = -1;
-				}
-			}
-		}
-
-		for (it = gTimerList.begin(); it != gTimerList.end(); it++)
-		{
-			Timer_t& rTimer(*it);
-
-			if (rTimer.countDown == -1)
-			{
-				gTimerList.erase(it);
-				
-				// the iterator is now invalid, so restart search
-				it = gTimerList.begin();
-
-				// if the list is now empty, don't try to increment 
-				// the iterator again
-				if (it == gTimerList.end()) break;
-			}
-		}
-
-		LeaveCriticalSection(&gLock);
-		// we only need to have a 1 second resolution
-		Sleep(1000);
-	}
-
-	return 0;
-}
-
-int SetTimerHandler(void (__cdecl *func ) (int))
-{
-	gTimerFunc = func;
-	return 0;
-}
-
-void InitTimer(void)
-{
-	assert(!gTimerInitialised);
-
-	InitializeCriticalSection(&gLock);
-	
-	// create our thread
-	HANDLE ourThread = (HANDLE)_beginthreadex(NULL, 0, RunTimer, 0, 
-		CREATE_SUSPENDED, NULL);
-	SetThreadPriority(ourThread, THREAD_PRIORITY_LOWEST);
-	ResumeThread(ourThread);
-
-	gTimerInitialised = true;
-}
-
-void FiniTimer(void)
-{
-	assert(gTimerInitialised);
-	gFinishTimer = true;
-	EnterCriticalSection(&gLock);
-	DeleteCriticalSection(&gLock);
-	gTimerInitialised = false;
-}
-
-//Our constants we need to keep track of
-//globals
 struct passwd gTempPasswd;
 
 bool EnableBackupRights()
@@ -715,11 +575,13 @@ HANDLE openfile(const char *pFileName, int flags, int mode)
 //
 // Function
 //		Name:    emu_fstat
-//		Purpose: replacement for fstat supply a windows handle
+//		Purpose: replacement for fstat. Supply a windows handle.
+//			 Returns a struct emu_stat to have room for 64-bit
+//			 file identifier in st_ino (mingw allows only 16!)
 //		Created: 25th October 2004
 //
 // --------------------------------------------------------------------------
-int emu_fstat(HANDLE hdir, struct stat * st)
+int emu_fstat(HANDLE hdir, struct emu_stat * st)
 {
 	if (hdir == INVALID_HANDLE_VALUE)
 	{
@@ -751,7 +613,7 @@ int emu_fstat(HANDLE hdir, struct stat * st)
 	ULARGE_INTEGER conv;
 	conv.HighPart = fi.nFileIndexHigh;
 	conv.LowPart  = fi.nFileIndexLow;
-	st->st_ino = (_ino_t)conv.QuadPart;
+	st->st_ino = conv.QuadPart;
 
 	// get the time information
 	st->st_ctime = ConvertFileTimeToTime_t(&fi.ftCreationTime);
@@ -898,12 +760,14 @@ HANDLE OpenFileByNameUtf8(const char* pFileName, DWORD flags)
 //
 // Function
 //		Name:    emu_stat 
-//		Purpose: replacement for the lstat and stat functions, 
-//			works with unicode filenames supplied in utf8 format
+//		Purpose: replacement for the lstat and stat functions. 
+//			 Works with unicode filenames supplied in utf8.
+//			 Returns a struct emu_stat to have room for 64-bit
+//			 file identifier in st_ino (mingw allows only 16!)
 //		Created: 25th October 2004
 //
 // --------------------------------------------------------------------------
-int emu_stat(const char * pName, struct stat * st)
+int emu_stat(const char * pName, struct emu_stat * st)
 {
 	HANDLE handle = OpenFileByNameUtf8(pName, 
 		FILE_READ_ATTRIBUTES | FILE_READ_EA);
diff --git a/lib/win32/emu.h b/lib/win32/emu.h
index 67921264..b29c901c 100644
--- a/lib/win32/emu.h
+++ b/lib/win32/emu.h
@@ -1,5 +1,17 @@
 // emulates unix syscalls to win32 functions
 
+#ifdef WIN32
+	#define EMU_STRUCT_STAT struct emu_stat
+	#define EMU_STAT  emu_stat
+	#define EMU_FSTAT emu_fstat
+	#define EMU_LSTAT emu_stat
+#else
+	#define EMU_STRUCT_STAT struct stat
+	#define EMU_STAT  ::stat
+	#define EMU_FSTAT ::fstat
+	#define EMU_LSTAT ::lstat
+#endif
+
 #if ! defined EMU_INCLUDE && defined WIN32
 #define EMU_INCLUDE
 
@@ -25,17 +37,9 @@
 
 #ifdef __MINGW32__
 	typedef uint32_t u_int32_t;
-	typedef uint64_t _ino_t;
-	typedef _ino_t ino_t;
-	#define _INO_T_
 #else
 	typedef unsigned int mode_t;
 	typedef unsigned int pid_t;
-
-	// must define _INO_T_DEFINED before including <sys/types.h>
-	// to replace it with our own.
-	typedef u_int64_t _ino_t;
-	#define _INO_T_DEFINED
 #endif
 
 // set up to include the necessary parts of Windows headers
@@ -81,11 +85,6 @@
 #define fileno(struct_file)   _fileno(struct_file)
 #endif
 
-int SetTimerHandler(void (__cdecl *func ) (int));
-int setitimer(int type, struct itimerval *timeout, void *arg);
-void InitTimer(void);
-void FiniTimer(void);
-
 struct passwd {
 	char *pw_name;
 	char *pw_passwd;
@@ -187,13 +186,6 @@ inline int geteuid(void)
 
 #define timespec timeval
 
-//not available in win32
-struct itimerval
-{
-	timeval 	it_interval;
-	timeval 	it_value;
-};
-
 //win32 deals in usec not nsec - so need to ensure this follows through
 #define tv_nsec tv_usec 
 
@@ -313,27 +305,19 @@ struct statfs
 	TCHAR f_mntonname[MAX_PATH];
 };
 
-#if 0
-// I think this should get us going
-// Although there is a warning about 
-// mount points in win32 can now exists - which means inode number can be 
-// duplicated, so potential of a problem - perhaps this needs to be 
-// implemented with a little more thought... TODO
-
-struct stat {
-	//_dev_t st_dev;
-	u_int64_t st_ino;
+struct emu_stat {
+	int st_dev;
+	uint64_t st_ino;
 	DWORD st_mode;
 	short st_nlink;
 	short st_uid;
 	short st_gid;
 	//_dev_t st_rdev;
-	u_int64_t st_size;
+	uint64_t st_size;
 	time_t st_atime;
 	time_t st_mtime;
 	time_t st_ctime;
 };
-#endif // 0
 
 // need this for conversions
 time_t ConvertFileTimeToTime_t(FILETIME *fileTime);
@@ -342,8 +326,8 @@ bool   ConvertTime_tToFileTime(const time_t from, FILETIME *pTo);
 int   emu_chdir  (const char* pDirName);
 int   emu_mkdir  (const char* pPathName);
 int   emu_unlink (const char* pFileName);
-int   emu_fstat  (HANDLE file,       struct stat* st);
-int   emu_stat   (const char* pName, struct stat* st);
+int   emu_fstat  (HANDLE file,       struct emu_stat* st);
+int   emu_stat   (const char* pName, struct emu_stat* st);
 int   emu_utimes (const char* pName, const struct timeval[]);
 int   emu_chmod  (const char* pName, mode_t mode);
 char* emu_getcwd (char* pBuffer,     int BufSize);
@@ -352,14 +336,22 @@ int   emu_rename (const char* pOldName, const char* pNewName);
 #define chdir(directory)        emu_chdir  (directory)
 #define mkdir(path,     mode)   emu_mkdir  (path)
 #define unlink(file)            emu_unlink (file)
-#define stat(filename,  struct) emu_stat   (filename, struct)
-#define lstat(filename, struct) emu_stat   (filename, struct)
-#define fstat(handle,   struct) emu_fstat  (handle,   struct)
 #define utimes(buffer,  times)  emu_utimes (buffer,   times)
 #define chmod(file,     mode)   emu_chmod  (file,     mode)
 #define getcwd(buffer,  size)   emu_getcwd (buffer,   size)
 #define rename(oldname, newname) emu_rename (oldname, newname)
 
+// Not safe to replace stat/fstat/lstat on mingw at least, as struct stat
+// has a 16-bit st_ino and we need a 64-bit one.
+//
+// #define stat(filename,  struct) emu_stat   (filename, struct)
+// #define lstat(filename, struct) emu_stat   (filename, struct)
+// #define fstat(handle,   struct) emu_fstat  (handle,   struct)
+//
+// But lstat doesn't exist on Windows, so we have to provide something:
+
+#define lstat(filename, struct) stat(filename, struct)
+
 int statfs(const char * name, struct statfs * s);
 
 int poll(struct pollfd *ufds, unsigned long nfds, int timeout);