Changeset 2275 for box/trunk/lib/common/FileStream.h

Timestamp:

07/09/2008 14:20:14 (4 years ago)

Author:

chris

Message:

Fix test regression on Windows where a const char pointer was treated
as a file handle instead of as a string.

File:

• box/trunk/lib/common/FileStream.h (modified) (2 diffs)

box/trunk/lib/common/FileStream.h

@@ -39 +39 @@
 #endif
                 int mode = (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
+
+        // Ensure that const char * name doesn't end up as a handle
+        // on Windows!
+
+        FileStream(const char *pFilename, 
+#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));
+
         FileStream(tOSFileHandle FileDescriptor);
         
@@ -57 +69 @@
         bool mIsEOF;
         FileStream(const FileStream &rToCopy) { /* do not call */ }
+        void AfterOpen();
 
         // for debugging..