6502/lzsa
1
0
Fork 0
mirror of https://github.com/emmanuel-marty/lzsa.git synced 2024-11-28 14:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Don't write an unnecessary footer byte when emitting a raw block

Browse Source
This commit is contained in:
emmanuel-marty 2019-04-05 12:13:51 +02:00
parent 1ef1ad8111
commit f05359b63d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main.c
View File

@ -224,14 +224,15 @@ static int lzsa_compress(const char *pszInFilename, const char *pszOutFilename,
} }
unsigned char cFooter[3]; unsigned char cFooter[3];
int nFooterSize = ((nOptions & OPT_RAW) == 0) ? 3 : 2;
cFooter[0] = 0x00; /* EOD frame (written even in raw mode, so that the end of the data can be detected) */ cFooter[0] = 0x00; /* EOD frame (written even in raw mode, so that the end of the data can be detected) */
cFooter[1] = 0x00; cFooter[1] = 0x00;
cFooter[2] = 0x00; cFooter[2] = 0x00;
if (!bError) if (!bError)
bError = fwrite(cFooter, 1, 3, f_out) != 3; bError = fwrite(cFooter, 1, nFooterSize, f_out) != nFooterSize;
nCompressedSize += 3LL; nCompressedSize += (long long) nFooterSize;
if (!bError && (nOptions & OPT_VERBOSE)) { if (!bError && (nOptions & OPT_VERBOSE)) {
nEndTime = lzsa_get_time(); nEndTime = lzsa_get_time();
@ -304,7 +305,7 @@ static int lzsa_decompress(const char *pszInFilename, const char *pszOutFilename
nFileSize = (unsigned int)ftell(pInFile); nFileSize = (unsigned int)ftell(pInFile);
fseek(pInFile, 0, SEEK_SET); fseek(pInFile, 0, SEEK_SET);
if (nFileSize < 3) { if (nFileSize < 2) {
fclose(pInFile); fclose(pInFile);
pInFile = NULL; pInFile = NULL;
fprintf(stderr, "invalid file size for raw block mode\n"); fprintf(stderr, "invalid file size for raw block mode\n");
@ -374,7 +375,7 @@ static int lzsa_decompress(const char *pszInFilename, const char *pszOutFilename
} }
} }
else { else {
nBlockSize = nFileSize - 3; nBlockSize = nFileSize - 2;
nFileSize = 0; nFileSize = 0;
} }
@ -482,7 +483,7 @@ static int lzsa_compare(const char *pszInFilename, const char *pszOutFilename, c
nFileSize = (unsigned int)ftell(pInFile); nFileSize = (unsigned int)ftell(pInFile);
fseek(pInFile, 0, SEEK_SET); fseek(pInFile, 0, SEEK_SET);
if (nFileSize < 3) { if (nFileSize < 2) {
fclose(pInFile); fclose(pInFile);
pInFile = NULL; pInFile = NULL;
fprintf(stderr, "invalid file size for raw block mode\n"); fprintf(stderr, "invalid file size for raw block mode\n");
@ -574,7 +575,7 @@ static int lzsa_compare(const char *pszInFilename, const char *pszOutFilename, c
} }
} }
else { else {
nBlockSize = nFileSize - 3; nBlockSize = nFileSize - 2;
nFileSize = 0; nFileSize = 0;
} }