Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/upx/upx into devel

Browse Source
This commit is contained in:
John Reiser
2017-05-21 20:48:05 -07:00
parent 082dd7d5ee b5bdf57636
commit f42a37555d
11 changed files with 108 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/help.cpp
+1 -10
View File
@@ -262,15 +262,6 @@ void show_help(int verbose)
con_fprintf(f,
" --8086 make compressed sys work on any 8086\n"
"\n");
#if 0
fg = con_fg(f,FG_YELLOW);
con_fprintf(f,"Options for linux/386\n");
fg = con_fg(f,fg);
con_fprintf(f,
" --script use /usr/local/lib/upx/upx[bd] as decompressor\n"
" --script=/path/upxX use path/upxX as decompressor\n"
"\n");
#endif
fg = con_fg(f,FG_YELLOW);
con_fprintf(f,"Options for ps1/exe:\n");
fg = con_fg(f,fg);
@@ -370,7 +361,7 @@ void show_license(void)
);
int fg = con_fg(f,FG_CYAN);
con_fprintf(f,
" http://upx.sourceforge.net\n"
" https://upx.github.io\n"
" http://www.oberhumer.com/opensource/upx/\n"
);
(void)con_fg(f,FG_ORANGE);
src/packer.cpp
+3 -3
View File
@@ -1367,7 +1367,7 @@ void Packer::compressWithFilters(upx_bytep i_ptr, unsigned i_len,
const unsigned overlap_range,
const upx_compress_config_t *cconf,
int filter_strategy,
int inhibit_compression_check)
bool inhibit_compression_check)
{
parm_ft->buf_len = f_len;
// struct copies
@@ -1568,7 +1568,7 @@ void Packer::compressWithFilters(Filter *ft,
const unsigned overlap_range,
const upx_compress_config_t *cconf,
int filter_strategy,
int inhibit_compression_check)
bool inhibit_compression_check)
{
compressWithFilters(ft, overlap_range, cconf, filter_strategy,
0, 0, 0, NULL, 0, inhibit_compression_check);
@@ -1583,7 +1583,7 @@ void Packer::compressWithFilters(Filter *ft,
unsigned ibuf_off,
unsigned obuf_off,
const upx_bytep hdr_ptr, unsigned hdr_len,
int inhibit_compression_check)
bool inhibit_compression_check)
{
ibuf.checkState(); obuf.checkState();
src/packer.h
+3 -3
View File
@@ -182,7 +182,7 @@ protected:
const unsigned overlap_range,
const upx_compress_config_t *cconf,
int filter_strategy = 0,
int inhibit_compression_check = 0);
bool inhibit_compression_check = false);
void compressWithFilters(Filter *ft,
const unsigned overlap_range,
const upx_compress_config_t *cconf,
@@ -191,7 +191,7 @@ protected:
unsigned compress_ibuf_off,
unsigned compress_obuf_off,
const upx_bytep hdr_ptr, unsigned hdr_len,
int inhibit_compression_check = 0);
bool inhibit_compression_check = false);
// real compression driver
void compressWithFilters(upx_bytep i_ptr, unsigned i_len,
upx_bytep o_ptr,
@@ -201,7 +201,7 @@ protected:
const unsigned overlap_range,
const upx_compress_config_t *cconf,
int filter_strategy,
int inhibit_compression_check = 0);
bool inhibit_compression_check = false);
// util for verifying overlapping decompresion
// non-destructive test
src/version.h
+5 -5
View File
@@ -1,8 +1,8 @@
#define UPX_VERSION_HEX 0x035e00 /* 03.94.00 */
#define UPX_VERSION_STRING "3.94"
#define UPX_VERSION_STRING4 "3.94"
#define UPX_VERSION_DATE "May 3rd 2017"
#define UPX_VERSION_DATE_ISO "2017-05-03"
#define UPX_VERSION_HEX 0x035f00 /* 03.95.00 */
#define UPX_VERSION_STRING "3.95"
#define UPX_VERSION_STRING4 "3.95"
#define UPX_VERSION_DATE "May 13th 2017"
#define UPX_VERSION_DATE_ISO "2017-05-12"
#define UPX_VERSION_YEAR "2017"
/* vim:set ts=4 sw=4 et: */