[Box Backup-dev] COMMIT r642 - box/chris/general/lib/win32

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2006-07-10 20:49:02 +0000 (Mon, 10 Jul 2006)
New Revision: 642

Modified:
   box/chris/general/lib/win32/emu.cpp
Log:
* emu.cpp
- Changed the requested permissions in openfile() to better match 
  expectations
- Fixed signed/unsigned warnings
- Replaced ASSERT() with assert() to avoid circular dependencies between
  lib/win32 and lib/common


Modified: box/chris/general/lib/win32/emu.cpp
===================================================================
--- box/chris/general/lib/win32/emu.cpp	2006-07-10 20:47:16 UTC (rev 641)
+++ box/chris/general/lib/win32/emu.cpp	2006-07-10 20:49:02 UTC (rev 642)
@@ -7,8 +7,9 @@
 
 #ifdef WIN32
 
+#include <assert.h>
+#include <fcntl.h>
 #include <windows.h>
-#include <fcntl.h>
 
 #ifdef HAVE_UNISTD_H
 	#include <unistd.h>
@@ -517,19 +518,19 @@
 
 	if (flags & O_WRONLY)
 	{
+		accessRights = FILE_WRITE_ATTRIBUTES 
+			| FILE_WRITE_DATA | FILE_WRITE_EA;
 		shareMode = FILE_SHARE_WRITE;
 	}
-	if (flags & O_RDWR)
+	if (flags & (O_RDWR | O_CREAT))
 	{
-		shareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
+		accessRights |= FILE_WRITE_ATTRIBUTES 
+			| FILE_WRITE_DATA | FILE_WRITE_EA;
+		shareMode |= FILE_SHARE_WRITE;
 	}
 	if (flags & O_CREAT)
 	{
 		createDisposition = OPEN_ALWAYS;
-		shareMode |= FILE_SHARE_WRITE;
-		accessRights |= FILE_WRITE_ATTRIBUTES 
-			| FILE_WRITE_DATA | FILE_WRITE_EA 
-			/*| FILE_ALL_ACCESS */;
 	}
 	if (flags & O_TRUNC)
 	{
@@ -984,7 +985,7 @@
 		timOut.tv_sec  = timeout / 1000;
 		timOut.tv_usec = timeout * 1000;
 
-		for (int i = 0; i < nfds; i++)
+		for (unsigned long i = 0; i < nfds; i++)
 		{
 			struct pollfd* ufd = &(ufds[i]);
 
@@ -1022,7 +1023,7 @@
 		}
 		else if (nready > 0)
 		{
-			for (int i = 0; i < nfds; i++)
+			for (unsigned long i = 0; i < nfds; i++)
 			{
 				struct pollfd *ufd = &(ufds[i]);
 
@@ -1228,7 +1229,7 @@
 	va_start(args, frmt);
 
 	int len = vsnprintf(buffer, sizeof(buffer)-1, sixfour.c_str(), args);
-	ASSERT(len < sizeof(buffer))
+	assert(len < sizeof(buffer));
 	buffer[sizeof(buffer)-1] = 0;
 
 	va_end(args);
@@ -1465,7 +1466,7 @@
 {
 	int bytes = 0;
 	
-	for (int i = 0; i < count; i++)
+	for (size_t i = 0; i < count; i++)
 	{
 		int result = read(filedes, vector[i].iov_base, 
 			vector[i].iov_len);
@@ -1483,7 +1484,7 @@
 {
 	int bytes = 0;
 	
-	for (int i = 0; i < count; i++)
+	for (size_t i = 0; i < count; i++)
 	{
 		int result = write(filedes, vector[i].iov_base, 
 			vector[i].iov_len);