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

Add support for UPX_VERSION_GITREV. Some cleanups.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2016-09-25 09:41:26 +02:00
parent 3c786acf2b
commit daafc29d2b
8 changed files with 62 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/help.cpp
+7 -8
View File
@@ -51,15 +51,14 @@ void show_head(void)
fg = con_fg(f,FG_GREEN);
con_fprintf(f,
" Ultimate Packer for eXecutables\n"
" Copyright (C) 1996 - %s\n"
"UPX %-10s Markus Oberhumer, Laszlo Molnar & John Reiser %14s\n\n",
UPX_VERSION_YEAR,
#if (ACC_OS_DOS16 || ACC_OS_DOS32)
" Copyright (C) 1996 - " UPX_VERSION_YEAR "\n"
"UPX %-11s Markus Oberhumer, Laszlo Molnar & John Reiser %14s\n\n",
#if defined(UPX_VERSION_GITREV)
"git-" UPX_VERSION_GITREV,
#elif (ACC_OS_DOS16 || ACC_OS_DOS32)
V("d"),
#elif (ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
V("w"),
#elif 0 && defined(__linux__)
V("l"),
#else
UPX_VERSION_STRING,
#endif
@@ -136,7 +135,7 @@ static void show_all_packers(FILE *f, int verbose)
{
const char *fn = pn.names[i].fname;
const char *sn = pn.names[i].sname;
if (verbose)
if (verbose > 0)
{
con_fprintf(f, " %-36s %s\n", fn, sn);
}
@@ -155,7 +154,7 @@ static void show_all_packers(FILE *f, int verbose)
}
}
}
if (!verbose && pn.names_count)
if (verbose <= 0 && pn.names_count)
con_fprintf(f, "\n");
}