* Added support for Win32 temporary files

 * Added InvisibleTempFileStream class and unit tests for it 
 * Use InvisibleTempFileStream instead of FileStream for temporary files
   (refs #3)

3 files changed, 83 insertions, 2 deletions

diff --git a/lib/common/InvisibleTempFileStream.cpp b/lib/common/InvisibleTempFileStream.cpp
new file mode 100644
index 00000000..a7e19ad3
--- /dev/null
+++ b/lib/common/InvisibleTempFileStream.cpp
@@ -0,0 +1,39 @@
+// --------------------------------------------------------------------------
+//
+// File
+//		Name:    InvisibleTempFileStream.cpp
+//		Purpose: IOStream interface to temporary files that
+//			delete themselves
+//		Created: 2006/10/13
+//
+// --------------------------------------------------------------------------
+
+#include "Box.h"
+#include "InvisibleTempFileStream.h"
+
+#include "MemLeakFindOn.h"
+
+// --------------------------------------------------------------------------
+//
+// Function
+//		Name:    InvisibleTempFileStream::InvisibleTempFileStream
+//			(const char *, int, int)
+//		Purpose: Constructor, opens invisible file
+//		Created: 2006/10/13
+//
+// --------------------------------------------------------------------------
+InvisibleTempFileStream::InvisibleTempFileStream(const char *Filename, int flags, int mode)
+#ifdef WIN32
+	: FileStream(::openfile(Filename, flags | O_TEMPORARY, mode))
+#else
+	: FileStream(::open(Filename, flags, mode))
+#endif
+{
+	#ifndef WIN32
+	if(unlink(Filename) != 0)
+	{
+		MEMLEAKFINDER_NOT_A_LEAK(this);
+		THROW_EXCEPTION(CommonException, OSFileOpenError)
+	}
+	#endif
+}
diff --git a/lib/common/InvisibleTempFileStream.h b/lib/common/InvisibleTempFileStream.h
new file mode 100644
index 00000000..a77d05e2
--- /dev/null
+++ b/lib/common/InvisibleTempFileStream.h
@@ -0,0 +1,35 @@
+// --------------------------------------------------------------------------
+//
+// File
+//		Name:    InvisibleTempFileStream.h
+//		Purpose: FileStream interface to temporary files that 
+//			delete themselves
+//		Created: 2006/10/13
+//
+// --------------------------------------------------------------------------
+
+#ifndef INVISIBLETEMPFILESTREAM__H
+#define INVISIBLETEMPFILESTREAM__H
+
+#include "FileStream.h"
+
+class InvisibleTempFileStream : public FileStream
+{
+public:
+	InvisibleTempFileStream(const char *Filename, 
+#ifdef WIN32
+		int flags = (O_RDONLY | O_BINARY),
+#else
+		int flags = O_RDONLY,
+#endif
+		int mode = (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
+
+private:	
+	InvisibleTempFileStream(const InvisibleTempFileStream &rToCopy) 
+	: FileStream(INVALID_FILE)
+	{ /* do not call */ }
+};
+
+#endif // INVISIBLETEMPFILESTREAM__H
+
+
diff --git a/lib/win32/emu.cpp b/lib/win32/emu.cpp
index 91684f1c..6ce1790c 100644
--- a/lib/win32/emu.cpp
+++ b/lib/win32/emu.cpp
@@ -521,7 +521,7 @@ HANDLE openfile(const char *pFileName, int flags, int mode)
 		accessRights = FILE_WRITE_DATA;
 		shareMode = FILE_SHARE_WRITE;
 	}
-	else if (flags & (O_RDWR | O_CREAT))
+	else if (flags & O_RDWR)
 	{
 		accessRights |= FILE_WRITE_ATTRIBUTES 
 			| FILE_WRITE_DATA | FILE_WRITE_EA;
@@ -541,12 +541,19 @@ HANDLE openfile(const char *pFileName, int flags, int mode)
 		shareMode = 0;
 	}
 
+	DWORD winFlags = FILE_FLAG_BACKUP_SEMANTICS;
+	if (flags & O_TEMPORARY)
+	{
+		winFlags  |= FILE_FLAG_DELETE_ON_CLOSE;
+		shareMode |= FILE_SHARE_DELETE;
+	}
+
 	HANDLE hdir = CreateFileW(pBuffer, 
 		accessRights, 
 		shareMode, 
 		NULL, 
 		createDisposition, 
-		FILE_FLAG_BACKUP_SEMANTICS,
+		winFlags,
 		NULL);
 	
 	delete [] pBuffer;