diff --git a/doc/Makefile b/doc/Makefile index 98bb8fe5..542f27a3 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -50,22 +50,28 @@ mostlyclean clean distclean maintainer-clean: %.1 : %.pod pod2man --center=" " --release="$(PACKAGE) $(VERSION)" --date="$(VERSION_DATE)" $< | $(RTRIM) > $@ + test -s $@ %.doc : %.pod pod2text < $< | $(RTRIM) > $@ + test -s $@ %.html : %.pod pod2html --noindex $< | $(RTRIM) | $(DETAB2) > $@ @rm -f pod2htm* + test -s $@ %.man : %.1 nroff -man $< | $(RTRIM) > $@ + test -s $@ %.ps : %.1 groff -man $< | $(RTRIM) > $@ + test -s $@ %.tex : %.pod pod2latex $< + test -s $@ ### diff --git a/doc/upx.pod b/doc/upx.pod index 6d196f69..90507c02 100644 --- a/doc/upx.pod +++ b/doc/upx.pod @@ -14,7 +14,7 @@ B S<[ I ]> S<[ I ]> I... The Ultimate Packer for eXecutables Copyright (c) 1996-2017 Markus Oberhumer, Laszlo Molnar & John Reiser - http://upx.sourceforge.net + https://upx.github.io B is a portable, extendable, high-performance executable packer for diff --git a/src/help.cpp b/src/help.cpp index 568cb318..efab3276 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -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); diff --git a/src/packer.cpp b/src/packer.cpp index bdc3e63d..496c6efd 100644 --- a/src/packer.cpp +++ b/src/packer.cpp @@ -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(); diff --git a/src/packer.h b/src/packer.h index b871edab..96d8a4ae 100644 --- a/src/packer.h +++ b/src/packer.h @@ -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