[Box Backup-dev] COMMIT r781 - box/chris/general/lib/common

boxbackup-dev at fluffy.co.uk boxbackup-dev at fluffy.co.uk
Sat Aug 19 16:31:48 BST 2006


Author: chris
Date: 2006-08-19 16:31:48 +0100 (Sat, 19 Aug 2006)
New Revision: 781

Modified:
   box/chris/general/lib/common/FileStream.cpp
   box/chris/general/lib/common/FileStream.h
Log:
* FileStream.h FileStream.cpp
- Replaced fd/HANDLE constructor, used by LocalProcessStream


Modified: box/chris/general/lib/common/FileStream.cpp
===================================================================
--- box/chris/general/lib/common/FileStream.cpp	2006-08-19 15:30:46 UTC (rev 780)
+++ box/chris/general/lib/common/FileStream.cpp	2006-08-19 15:31:48 UTC (rev 781)
@@ -43,9 +43,57 @@
 #endif
 }
 
+
 // --------------------------------------------------------------------------
 //
 // Function
+//		Name:    FileStream::FileStream(tOSFileHandle)
+//		Purpose: Constructor, using existing file descriptor
+//		Created: 2003/08/28
+//
+// --------------------------------------------------------------------------
+FileStream::FileStream(tOSFileHandle FileDescriptor)
+	: mOSFileHandle(FileDescriptor),
+	  mIsEOF(false)
+{
+#ifdef WIN32
+	if(mOSFileHandle == INVALID_HANDLE_VALUE)
+#else
+	if(mOSFileHandle < 0)
+#endif
+	{
+		MEMLEAKFINDER_NOT_A_LEAK(this);
+		THROW_EXCEPTION(CommonException, OSFileOpenError)
+	}
+#ifdef WIN32
+	this->fileName = "HANDLE";
+#endif
+}
+
+#if 0
+// --------------------------------------------------------------------------
+//
+// Function
+//		Name:    FileStream::FileStream(const FileStream &)
+//		Purpose: Copy constructor, creates a duplicate of the file handle
+//		Created: 2003/07/31
+//
+// --------------------------------------------------------------------------
+FileStream::FileStream(const FileStream &rToCopy)
+	: mOSFileHandle(::dup(rToCopy.mOSFileHandle)),
+	  mIsEOF(rToCopy.mIsEOF)
+{
+	if(mOSFileHandle < 0)
+	{
+		MEMLEAKFINDER_NOT_A_LEAK(this);
+		THROW_EXCEPTION(CommonException, OSFileOpenError)
+	}
+}
+#endif // 0
+
+// --------------------------------------------------------------------------
+//
+// Function
 //		Name:    FileStream::~FileStream()
 //		Purpose: Destructor, closes file
 //		Created: 2003/07/31

Modified: box/chris/general/lib/common/FileStream.h
===================================================================
--- box/chris/general/lib/common/FileStream.h	2006-08-19 15:30:46 UTC (rev 780)
+++ box/chris/general/lib/common/FileStream.h	2006-08-19 15:31:48 UTC (rev 781)
@@ -38,6 +38,7 @@
 		int flags = O_RDONLY,
 #endif
 		int mode = (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
+	FileStream(tOSFileHandle FileDescriptor);
 	
 	virtual ~FileStream();
 	




More information about the Boxbackup-dev mailing list