dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

made SetCompressor handle switching back from bzip2 to zlib

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@889 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
justin1014 2002-09-03 16:38:33 +00:00
parent c411481d1f
commit b9d46504df
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Source/script.cpp
View file

@ -1333,9 +1333,26 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
} }
int k=line.gettoken_enum(1,"zlib\0bzip2\0"); int k=line.gettoken_enum(1,"zlib\0bzip2\0");
switch (k) { switch (k) {
case 0: case 0: // JF> should handle the state of going from bzip2 back to zlib:
// Default is zlib... compressor = &zlib_compressor;
break; free(header_data_new);
header_data_new=(unsigned char*)malloc(zlib_exeheader_size);
exeheader_size_new=zlib_exeheader_size;
exeheader_size=zlib_exeheader_size;
if (!header_data_new)
{
ERROR_MSG("Internal compiler error #12345: malloc(%d) failed\n",exeheader_size_new);
extern void quit(); quit();
}
memcpy(header_data_new,zlib_header_data,zlib_exeheader_size);
#ifdef NSIS_ZLIB_COMPRESS_WHOLE
build_compress_whole=true;
#else
build_compress_whole=false;
#endif
break;
case 1: case 1:
compressor=&bzip2_compressor; compressor=&bzip2_compressor;
free(header_data_new); free(header_data_new);