Apple-2-Tools/apple2_prodos_utils
1
0
Fork 0
mirror of https://github.com/Michaelangel007/apple2_prodos_utils.git synced 2024-12-27 05:32:56 +00:00
Code Issues Projects Releases Wiki Activity

Bugfix: Sapling file size can be larger then blocks used on disk. Pad with zeroes when extracting

Browse Source
This commit is contained in:
michaelangel007 2023-06-12 23:25:01 -07:00
parent 741a5cc36f
commit c6b6d387ba
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
prodos.tools.cpp
View File

@ -1465,15 +1465,36 @@ bool ProDOS_FileExtract( const char *path )
case ProDOS_KIND_SAPL: // <= 128 KB
{
int nBlock = pEntry->blocks - 1; // 1st block is index block
int nBytes = size;
#if DEBUG_EXTRACT
printf( "ProDOS File Size: $%06X (%d)\n", size, size );
printf( "i-node (8-bit) : @ $%04X\n" , pEntry->inode );
// printf( "Filename Length : %04X\n", pEntry->len );
printf( "File Blocks : $%04X (%d)\n", pEntry->blocks, pEntry->blocks ); // Includes i-nodes
printf( "Total Blocks : $%04X (%d)\n", nBlock , nBlock );
#endif
for( int iBlock = 0; iBlock < nBlock; iBlock++ )
{
int iDataBlock = DskGetIndexBlock( addr, iBlock );
int iDataOffset = iDataBlock * PRODOS_BLOCK_SIZE;
int nSlack = min( nBytes, PRODOS_BLOCK_SIZE);
nBytes -= PRODOS_BLOCK_SIZE;
#if DEBUG_EXTRACT
int bLastBlock = (iBlock == (nBlock - 1));
printf( "Block: %02X/%02X @ %04X, LastBlock? %d, Bytes: %6d, Slack: %3d\n", iBlock, nBlock-1, iDataBlock, bLastBlock, nBytes + PRODOS_BLOCK_SIZE, nSlack );
#endif
fwrite( &gaDsk[ iDataOffset ], 1, nSlack, pFileData );
}
if( iBlock != nBlock - 1 )
fwrite( &gaDsk[ iDataOffset ], 1, PRODOS_BLOCK_SIZE, pFileData );
else
fwrite( &gaDsk[ iDataOffset ], 1, pEntry->size % PRODOS_BLOCK_SIZE, pFileData );
// File size is larger then blocks used on disk?!
if( nBytes > 0 )
{
// pad with zeroes
#if DEBUG_EXTRACT
int nSlack = min( nBytes, PRODOS_BLOCK_SIZE);
printf( "PADDING extra ZERO Bytes: %6d, Slack: %3d\n", nBytes, nSlack );
#endif
fwrite( &gaTmp, 1, nBytes, pFileData );
}
break;
}