src: add --version-short option; support doctest --dt-XXX options; cleanups

2022-10-23 23:09:13 +02:00
parent fff53efc05
commit 283c1cf931
7 changed files with 61 additions and 23 deletions
@@ -376,18 +376,18 @@ void show_license(void)
 //
 **************************************************************************/

-void show_version(int x)
+void show_version(bool one_line)
 {
    FILE *fp = stdout;
    const char *v;
-    UNUSED(x);
-    UNUSED(v);

    fprintf(fp, "upx %s\n", UPX_VERSION_STRING
 #if defined(UPX_VERSION_GITREV)
            "-git-" UPX_VERSION_GITREV
 #endif
           );
+    if (one_line)
+        return;
 #if (WITH_NRV)
    v = upx_nrv_version_string();
    if (v != nullptr && v[0])