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

Minor cleanups.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2017-05-14 19:21:04 +02:00
parent a3a81ce7c6
commit b5bdf57636
5 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/Makefile
+6
View File
@@ -50,22 +50,28 @@ mostlyclean clean distclean maintainer-clean:
%.1 : %.pod %.1 : %.pod
pod2man --center=" " --release="$(PACKAGE) $(VERSION)" --date="$(VERSION_DATE)" $< | $(RTRIM) > $@ pod2man --center=" " --release="$(PACKAGE) $(VERSION)" --date="$(VERSION_DATE)" $< | $(RTRIM) > $@
test -s $@
%.doc : %.pod %.doc : %.pod
pod2text < $< | $(RTRIM) > $@ pod2text < $< | $(RTRIM) > $@
test -s $@
%.html : %.pod %.html : %.pod
pod2html --noindex $< | $(RTRIM) | $(DETAB2) > $@ pod2html --noindex $< | $(RTRIM) | $(DETAB2) > $@
@rm -f pod2htm* @rm -f pod2htm*
test -s $@
%.man : %.1 %.man : %.1
nroff -man $< | $(RTRIM) > $@ nroff -man $< | $(RTRIM) > $@
test -s $@
%.ps : %.1 %.ps : %.1
groff -man $< | $(RTRIM) > $@ groff -man $< | $(RTRIM) > $@
test -s $@
%.tex : %.pod %.tex : %.pod
pod2latex $< pod2latex $<
test -s $@
### ###
doc/upx.pod
+1 -1
View File
@@ -14,7 +14,7 @@ B<upx> S<[ I<command> ]> S<[ I<options> ]> I<filename>...
The Ultimate Packer for eXecutables The Ultimate Packer for eXecutables
Copyright (c) 1996-2017 Markus Oberhumer, Laszlo Molnar & John Reiser Copyright (c) 1996-2017 Markus Oberhumer, Laszlo Molnar & John Reiser
http://upx.sourceforge.net https://upx.github.io
B<UPX> is a portable, extendable, high-performance executable packer for B<UPX> is a portable, extendable, high-performance executable packer for
src/help.cpp
+1 -10
View File
@@ -262,15 +262,6 @@ void show_help(int verbose)
con_fprintf(f, con_fprintf(f,
" --8086 make compressed sys work on any 8086\n" " --8086 make compressed sys work on any 8086\n"
"\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); fg = con_fg(f,FG_YELLOW);
con_fprintf(f,"Options for ps1/exe:\n"); con_fprintf(f,"Options for ps1/exe:\n");
fg = con_fg(f,fg); fg = con_fg(f,fg);
@@ -370,7 +361,7 @@ void show_license(void)
); );
int fg = con_fg(f,FG_CYAN); int fg = con_fg(f,FG_CYAN);
con_fprintf(f, con_fprintf(f,
" http://upx.sourceforge.net\n" " https://upx.github.io\n"
" http://www.oberhumer.com/opensource/upx/\n" " http://www.oberhumer.com/opensource/upx/\n"
); );
(void)con_fg(f,FG_ORANGE); (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 unsigned overlap_range,
const upx_compress_config_t *cconf, const upx_compress_config_t *cconf,
int filter_strategy, int filter_strategy,
int inhibit_compression_check) bool inhibit_compression_check)
{ {
parm_ft->buf_len = f_len; parm_ft->buf_len = f_len;
// struct copies // struct copies
@@ -1568,7 +1568,7 @@ void Packer::compressWithFilters(Filter *ft,
const unsigned overlap_range, const unsigned overlap_range,
const upx_compress_config_t *cconf, const upx_compress_config_t *cconf,
int filter_strategy, int filter_strategy,
int inhibit_compression_check) bool inhibit_compression_check)
{ {
compressWithFilters(ft, overlap_range, cconf, filter_strategy, compressWithFilters(ft, overlap_range, cconf, filter_strategy,
0, 0, 0, NULL, 0, inhibit_compression_check); 0, 0, 0, NULL, 0, inhibit_compression_check);
@@ -1583,7 +1583,7 @@ void Packer::compressWithFilters(Filter *ft,
unsigned ibuf_off, unsigned ibuf_off,
unsigned obuf_off, unsigned obuf_off,
const upx_bytep hdr_ptr, unsigned hdr_len, const upx_bytep hdr_ptr, unsigned hdr_len,
int inhibit_compression_check) bool inhibit_compression_check)
{ {
ibuf.checkState(); obuf.checkState(); ibuf.checkState(); obuf.checkState();
src/packer.h
+3 -3
View File
@@ -182,7 +182,7 @@ protected:
const unsigned overlap_range, const unsigned overlap_range,
const upx_compress_config_t *cconf, const upx_compress_config_t *cconf,
int filter_strategy = 0, int filter_strategy = 0,
int inhibit_compression_check = 0); bool inhibit_compression_check = false);
void compressWithFilters(Filter *ft, void compressWithFilters(Filter *ft,
const unsigned overlap_range, const unsigned overlap_range,
const upx_compress_config_t *cconf, const upx_compress_config_t *cconf,
@@ -191,7 +191,7 @@ protected:
unsigned compress_ibuf_off, unsigned compress_ibuf_off,
unsigned compress_obuf_off, unsigned compress_obuf_off,
const upx_bytep hdr_ptr, unsigned hdr_len, const upx_bytep hdr_ptr, unsigned hdr_len,
int inhibit_compression_check = 0); bool inhibit_compression_check = false);
// real compression driver // real compression driver
void compressWithFilters(upx_bytep i_ptr, unsigned i_len, void compressWithFilters(upx_bytep i_ptr, unsigned i_len,
upx_bytep o_ptr, upx_bytep o_ptr,
@@ -201,7 +201,7 @@ protected:
const unsigned overlap_range, const unsigned overlap_range,
const upx_compress_config_t *cconf, const upx_compress_config_t *cconf,
int filter_strategy, int filter_strategy,
int inhibit_compression_check = 0); bool inhibit_compression_check = false);
// util for verifying overlapping decompresion // util for verifying overlapping decompresion
// non-destructive test // non-destructive test