1 files changed, 28 insertions, 12 deletions

diff --git a/src/nidsstream.cpp b/src/nidsstream.cpp
index 740dc1f..4f692c6 100644
--- a/src/nidsstream.cpp
+++ b/src/nidsstream.cpp
@@ -9,7 +9,7 @@ Bu::NidsStream::NidsStream( Nids &rNids, uint32_t uStream ) :
         uBlockSize( rNids.iBlockSize-sizeof(Nids::Block) ),
         uPos( 0 )
 {
-        printf("NidsStream::allocated\n");
+        //printf("NidsStream::allocated\n");
         pCurBlock = rNids.newBlock();
         rNids.getBlock( uStream, pCurBlock );
         uSize = pCurBlock->uBytesUsed;
@@ -34,6 +34,7 @@ Bu::NidsStream::NidsStream( const Bu::NidsStream &rSrc ) :
 
 Bu::NidsStream::~NidsStream()
 {
+        //printf("Destroying stream?\n");
         rNids.updateStreamSize( uStream, uSize );
         rNids.deleteBlock( pCurBlock );
 }
@@ -47,20 +48,35 @@ size_t Bu::NidsStream::read( void *pBuf, size_t nBytes )
         if( uPos%uBlockSize+nBytes < uBlockSize )
         {
                 size_t iRead = nBytes;
-                if( iRead > pCurBlock->uBytesUsed )
-                        iRead = pCurBlock->uBytesUsed;
+                if( iRead > pCurBlock->uBytesUsed-(uPos%uBlockSize) )
+                        iRead = pCurBlock->uBytesUsed-(uPos%uBlockSize);
                 memcpy( pBuf, pCurBlock->pData+(uPos%uBlockSize), iRead );
-                uPos += nBytes;
-                printf("a: block %u = %ub (%ub total)\n",
-                        uCurBlock, pCurBlock->uBytesUsed, uSize );
+                uPos += iRead;
+                //printf("a: block %u = %ub (%ub total)\n",
+                //      uCurBlock, pCurBlock->uBytesUsed, uSize );
                 return iRead;
         }
         else
         {
-                //size_t iTotal = 0;
+                size_t nTotal = 0;
                 for(;;)
                 {
-                        
+                        uint32_t iRead = nBytes;
+                        if( iRead > uBlockSize-(uPos%uBlockSize) )
+                                iRead = uBlockSize-(uPos%uBlockSize);
+                        if( iRead > pCurBlock->uBytesUsed-(uPos%uBlockSize) )
+                                iRead = pCurBlock->uBytesUsed-(uPos%uBlockSize);
+                        memcpy( ((char *)pBuf)+nTotal,
+                                pCurBlock->pData+(uPos%uBlockSize), iRead );
+                        uPos += iRead;
+                        nBytes -= iRead;
+                        nTotal += iRead;
+                        //printf("r: block %u = %ub/%ub (%ub total)\n",
+                        //      uCurBlock, iRead, pCurBlock->uBytesUsed, uSize );
+                        if( nBytes == 0 || uPos == uSize )
+                                return nTotal;
+                        if( nTotal%uBlockSize == 0 )
+                                uCurBlock = rNids.getNextBlock( uCurBlock, pCurBlock, false );
                 }
         }
         return 0;
@@ -75,8 +91,8 @@ size_t Bu::NidsStream::write( const void *pBuf, size_t nBytes )
                 rNids.setBlock( uCurBlock, pCurBlock );
                 uPos += nBytes;
                 uSize += nBytes;
-                printf("a: block %u = %ub (%ub total)\n",
-                        uCurBlock, pCurBlock->uBytesUsed, uSize );
+                //printf("a: block %u = %ub (%ub total)\n",
+                //      uCurBlock, pCurBlock->uBytesUsed, uSize );
                 return nBytes;
         }
         else
@@ -95,8 +111,8 @@ size_t Bu::NidsStream::write( const void *pBuf, size_t nBytes )
                         uPos += uNow;
                         nTotal += uNow;
                         nBytes -= uNow;
-                        printf("b: block %u = %ub (%ub total)\n",
-                                uCurBlock, pCurBlock->uBytesUsed, uSize );
+                        //printf("b: block %u = %ub (%ub total)\n",
+                        //      uCurBlock, pCurBlock->uBytesUsed, uSize );
                         if( nBytes == 0 )
                                 return nTotal;
                         if( pCurBlock->uBytesUsed == uBlockSize )