6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-23 05:29:23 +00:00
Code Issues Projects Releases Wiki Activity

Imputes the alignment requirement for CAS headers.

Browse Source 
Also stops adding a spurious 0xff as the final byte on the tape.
This commit is contained in:
Thomas Harte 2017-12-29 10:42:18 -05:00
parent c481293aca
commit 98a9d57c0b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Storage/Tape/Formats/CAS.cpp
View File

@ -41,15 +41,18 @@ CAS::CAS(const char *file_name) {
chunk.long_header = bytes_are_equal && ((lookahead[0] == 0xd3) || (lookahead[0] == 0xd0) || (lookahead[0] == 0xea)); chunk.long_header = bytes_are_equal && ((lookahead[0] == 0xd3) || (lookahead[0] == 0xd0) || (lookahead[0] == 0xea));
chunk.has_gap = chunk.long_header && (chunks_.size() > 1); chunk.has_gap = chunk.long_header && (chunks_.size() > 1);
// Keep going until another header arrives or the file ends. // Keep going until another header arrives or the file ends. Headers require the magic byte sequence,
while(std::memcmp(lookahead, header_signature, sizeof(header_signature)) && !file.eof()) { // and also must be eight-byte aligned within the file.
while( !file.eof() &&
(std::memcmp(lookahead, header_signature, sizeof(header_signature)) || ((file.tell()-10)&7))) {
chunk.data.push_back(lookahead[0]); chunk.data.push_back(lookahead[0]);
get_next(file, lookahead, 1); get_next(file, lookahead, 1);
} }
// If the file ended, flush the lookahead. // If the file ended, flush the lookahead. The final thing in it will be a 0xff from the read that
// triggered the eof, so don't include that.
if(file.eof()) { if(file.eof()) {
for(std::size_t index = 0; index < sizeof(lookahead); index++) for(std::size_t index = 0; index < sizeof(lookahead) - 1; index++)
chunk.data.push_back(lookahead[index]); chunk.data.push_back(lookahead[index]);
} }
} }