ZIP reading fixes

stepmania/src/RageFile.cpp

@@ -31,7 +31,9 @@ RageFile::RageFile( const RageFile &cpy )
 	m_Error = cpy.m_Error;
 	m_EOF = cpy.m_EOF;
 	m_FilePos = cpy.m_FilePos;
-	memcpy( this->m_Buffer, cpy.m_Buffer, cpy.m_BufAvail );
+	memcpy( this->m_Buffer, cpy.m_Buffer, sizeof(m_Buffer) );
+	m_pBuf = m_Buffer + (cpy.m_pBuf-cpy.m_Buffer);
+
 	m_BufAvail = cpy.m_BufAvail;
 }
 
@@ -243,6 +245,8 @@ int RageFile::Read( void *buffer, size_t bytes )
 		if( !bytes )
 			break;
 
+		ASSERT( !m_BufAvail );
+
 		/* We need more; either fill the buffer and keep going, or just read directly
 		 * into the destination buffer. */
 		if( bytes >= sizeof(m_Buffer) )

stepmania/src/RageFileDriverDirect.cpp

@@ -161,7 +161,7 @@ RageFileObj *RageFileObjDirect::Copy( RageFile &p ) const
 	if( ret == NULL )
 		RageException::Throw("Couldn't reopen \"%s\": %s", path.c_str(), strerror(err) );
 
-	ret->Seek( parent.Tell() );
+	ret->Seek( lseek( fd, 0, SEEK_CUR ) );
 
 	return ret;
 }