INTEGRATION: CWS cov2src (1.5.14); FILE MERGED

2005/10/18 08:10:34 rt 1.5.14.1: #126234# Join MWS COV680 m4 into SRC680

1 files changed, 112 insertions, 82 deletions

diff --git a/configmgr/source/misc/oslstream.cxx b/configmgr/source/misc/oslstream.cxx
index 9920eaf92c8d..aff7d89d3ea0 100644
--- a/configmgr/source/misc/oslstream.cxx
+++ b/configmgr/source/misc/oslstream.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: oslstream.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 04:10:53 $
+ *  last change: $Author: rt $ $Date: 2005-10-19 12:17:34 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -37,17 +37,27 @@
 #include "oslstream.hxx"
 #endif
 
-//#ifndef _STREAM_HXX //autogen
-//#include <tools/stream.hxx>
-//#endif
-//#ifndef _TOOLS_DEBUG_HXX
-//#include <tools/debug.hxx>
-//#endif
+#include "filehelper.hxx"
 
 namespace configmgr
 {
     using namespace osl;
 
+    static void raiseIOException(osl::File::RC error, staruno::Reference<staruno::XInterface> const & context)
+    {
+        const rtl::OUString message = FileHelper::createOSLErrorString(error);
+        switch (error)
+        {
+        case File::E_NOMEM:
+            throw stario::BufferSizeExceededException(message, context);
+
+        case File::E_BADF:
+            throw stario::NotConnectedException(message, context);
+
+        default:
+            throw stario::IOException(message, context);
+        }
+    }
 //------------------------------------------------------------------
 OSLInputStreamWrapper::OSLInputStreamWrapper( File& _rFile )
                  :m_pFile(&_rFile)
@@ -211,127 +221,147 @@ void SAL_CALL OSLOutputStreamWrapper::closeOutput() throw( stario::NotConnectedE
 // -----------------------------------------------------------------------------
 //------------------------------------------------------------------
 /*
-OSLInputBufferedStreamWrapper::OSLInputBufferedStreamWrapper( File& _rFile )
+BufferedFileInputStream::BufferedFileInputStream( File& _rFile )
                  :m_pFile(&_rFile)
                  ,m_bFileOwner(sal_False)
 {
 }
 */
 //------------------------------------------------------------------
-OSLInputBufferedStreamWrapper::OSLInputBufferedStreamWrapper( OTrivialBufferedFile* pStream, sal_Bool bOwner )
-                 :m_pFile( pStream )
-                 ,m_bFileOwner( bOwner )
+BufferedFileInputStream::BufferedFileInputStream( rtl::OUString const & aFileURL)
+: m_aFile( aFileURL )
 {
+    osl::File::RC rc = m_aFile.open(osl_File_OpenFlag_Read);
+    if (rc != File::E_None)
+        raiseIOException(rc,NULL);
 }
 
 //------------------------------------------------------------------
-OSLInputBufferedStreamWrapper::~OSLInputBufferedStreamWrapper()
+BufferedFileInputStream::~BufferedFileInputStream()
 {
-    if( m_bFileOwner )
-        delete m_pFile;
 }
 
 //------------------------------------------------------------------------------
-sal_Int32 SAL_CALL OSLInputBufferedStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-                throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
+sal_Int32 SAL_CALL BufferedFileInputStream::readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
+    throw( stario::NotConnectedException, stario::BufferSizeExceededException,
+            stario::IOException, staruno::RuntimeException )
 {
-    if (!m_pFile)
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
-
     if (nBytesToRead < 0)
-        throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
-
-    ::osl::MutexGuard aGuard( m_aMutex );
+        raiseIOException(osl::File::E_INVAL, *this);
 
     aData.realloc(nBytesToRead);
 
+    sal_uInt64 nSize = sal_uInt64(nBytesToRead);
     sal_uInt64 nRead = 0;
-    File::RC eError = m_pFile->read((void*)aData.getArray(), nBytesToRead, nRead);
-    if (eError != File::E_None)
-        throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
 
-    return nRead;
+    File::RC rc = m_aFile.read(aData.getArray(), nSize, nRead);
+    if (rc != File::E_None)
+        raiseIOException(rc,*this);
+
+    OSL_ASSERT(nRead <= nSize);
+    return sal_Int32(nRead);
 }
 
 //------------------------------------------------------------------------------
-sal_Int32 SAL_CALL OSLInputBufferedStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
+sal_Int32 SAL_CALL BufferedFileInputStream::readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
+    throw( stario::NotConnectedException, stario::BufferSizeExceededException,
+            stario::IOException, staruno::RuntimeException )
 {
-    if (!m_pFile)
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
-
-    if (nMaxBytesToRead < 0)
-        throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
-
-    /*
-      if (m_pFile->IsEof())
-      {
-      aData.realloc(0);
-      return 0;
-      }
-      else
-    */
     return readBytes(aData, nMaxBytesToRead);
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL OSLInputBufferedStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
+void SAL_CALL BufferedFileInputStream::skipBytes(sal_Int32 nBytesToSkip)
+    throw( stario::NotConnectedException, stario::BufferSizeExceededException,
+            stario::IOException, staruno::RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
-    if (!m_pFile)
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
+    if (nBytesToSkip < 0)
+        raiseIOException(osl::File::E_INVAL, *this);
 
-    sal_uInt64 nCurrentPos;
-    m_pFile->getPos(nCurrentPos);
+    sal_uInt64 nOffset = sal_uInt64(nBytesToSkip);
 
-    sal_uInt64 nNewPos = nCurrentPos + nBytesToSkip;
-    File::RC eError = m_pFile->setPos(osl_Pos_Absolut, nNewPos);
-    if (eError != File::E_None)
-    {
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
-    }
+    File::RC rc = m_aFile.setPos(osl_Pos_Current, nOffset);
+    if (rc != File::E_None)
+        raiseIOException(rc,*this);
 }
 
 //------------------------------------------------------------------------------
-sal_Int32 SAL_CALL OSLInputBufferedStreamWrapper::available() throw( stario::NotConnectedException, staruno::RuntimeException )
+sal_Int32 SAL_CALL BufferedFileInputStream::available()
+    throw( stario::NotConnectedException, stario::IOException, staruno::RuntimeException )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
-    if (!m_pFile)
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
+    sal_uInt64 avail = 0;
+    File::RC rc = m_aFile.available(avail);
+    if (rc != File::E_None)
+        raiseIOException(rc,*this);
 
-    sal_uInt64 nPos;
-    File::RC eError = m_pFile->getPos(nPos);
-    if (eError != File::E_None)
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
+    sal_Int32 result = sal_Int32(avail);
+    if (result < 0 || sal_uInt64(result) < avail)
+        result = SAL_MAX_INT32;
 
-    sal_uInt64 nDummy = 0;
-    eError = m_pFile->setPos(Pos_End, nDummy);
-    if (eError != File::E_None)
-       throw stario::NotConnectedException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
+    return result;
+}
 
-    sal_uInt64 nAvailable;
-    eError = m_pFile->getPos(nAvailable);
-    if (eError != File::E_None)
-       throw stario::NotConnectedException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
+//------------------------------------------------------------------------------
+void SAL_CALL BufferedFileInputStream::closeInput()
+    throw( stario::NotConnectedException, stario::IOException, staruno::RuntimeException )
+{
+    File::RC rc = m_aFile.close();
+    if (rc != File::E_None)
+        raiseIOException(rc,*this);
+}
 
-    nAvailable = nAvailable - nPos;
-    eError = m_pFile->setPos(Pos_Absolut, nPos);
-    if (eError != File::E_None)
-       throw stario::NotConnectedException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
-    return nAvailable;
+//------------------------------------------------------------------
+//------------------------------------------------------------------
+BufferedFileOutputStream::BufferedFileOutputStream( rtl::OUString const & aFileURL, bool bCreate, sal_uInt32 nBufferSizeHint)
+: m_aFile( aFileURL, nBufferSizeHint )
+{
+    sal_Int32 flags = bCreate ? OpenFlag_Write|OpenFlag_Create : OpenFlag_Write;
+
+    osl::File::RC rc = m_aFile.open(flags);
+    if (rc != File::E_None)
+        raiseIOException(rc,NULL);
+}
+
+//------------------------------------------------------------------
+BufferedFileOutputStream::~BufferedFileOutputStream()
+{
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL OSLInputBufferedStreamWrapper::closeInput() throw( stario::NotConnectedException, staruno::RuntimeException )
+void SAL_CALL BufferedFileOutputStream::writeBytes(const staruno::Sequence< sal_Int8 >& aData)
+    throw( stario::NotConnectedException, stario::BufferSizeExceededException,
+            stario::IOException, staruno::RuntimeException )
 {
-    if (!m_pFile)
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
+    const sal_uInt64 size = sal_uInt64(aData.getLength());
+    sal_uInt64 written = 0;
 
-    m_pFile->close();
-    if (m_bFileOwner)
-        delete m_pFile;
+    osl::File::RC rc = m_aFile.write(aData.getConstArray(), size, written);
+    if (rc != File::E_None)
+        raiseIOException(rc,*this);
 
-    m_pFile = NULL;
+    // we don't support special files where multiple write passes are needed
+    if (written < size)
+        raiseIOException(File::E_IO,*this);
 }
+
+void SAL_CALL BufferedFileOutputStream::flush()
+    throw( stario::NotConnectedException, stario::BufferSizeExceededException,
+            stario::IOException, staruno::RuntimeException )
+{
+    osl::File::RC rc = m_aFile.sync();
+    if (rc != File::E_None)
+        raiseIOException(rc,*this);
+}
+
+void SAL_CALL BufferedFileOutputStream::closeOutput()
+    throw( stario::NotConnectedException, stario::BufferSizeExceededException,
+            stario::IOException, staruno::RuntimeException )
+{
+    osl::File::RC rc = m_aFile.close();
+    if (rc != File::E_None)
+        raiseIOException(rc,*this);
+}
+
 } // namespace configmgr