Changeset 2275

Timestamp:

07/09/2008 14:20:14 (3 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.

Location:

box/trunk/lib/common

Files:

• FileStream.cpp (modified) (2 diffs)
• FileStream.h (modified) (2 diffs)

box/trunk/lib/common/FileStream.cpp

@@ -33 +33 @@
           mIsEOF(false),
           mFileName(rFilename)
+{
+        AfterOpen();
+}
+
+// --------------------------------------------------------------------------
+//
+// Function
+//              Name:    FileStream::FileStream(const char *, int, int)
+//              Purpose: Alternative constructor, takes a const char *,
+//                       avoids const strings being interpreted as handles!
+//              Created: 2003/07/31
+//
+// --------------------------------------------------------------------------
+FileStream::FileStream(const char *pFilename, int flags, int mode)
+#ifdef WIN32
+        : mOSFileHandle(::openfile(pFilename, flags, mode)),
+#else
+        : mOSFileHandle(::open(pFilename, flags, mode)),
+#endif
+          mIsEOF(false),
+          mFileName(pFilename)
+{
+        AfterOpen();
+}
+
+void FileStream::AfterOpen()
 {
 #ifdef WIN32
@@ -49 +75 @@
                 {
                         BOX_LOG_SYS_WARNING("Failed to open file: " <<
-                                rFilename);
+                                mFileName);
                         THROW_EXCEPTION(CommonException, OSFileOpenError)
                 }

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..