From 78aaed11d85be690204fbd956732a7c1f18363e3 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Mon, 16 May 2022 20:32:16 -0300 Subject: ci: fix --version not printing compile-time features Currently, when running on CI, `firejail --version` only prints the following line: firejail version 0.9.69 Add a new print_version() function that always prints both the above and the compile-time options (like it is done outside of CI) and call it in both of the places that handle --version on main.c. Misc: The printing of compile-time features was added on commit 48dd1fbec ("apparmor", 2016-08-02). --- src/firejail/checkcfg.c | 6 ++++++ src/firejail/firejail.h | 1 + src/firejail/main.c | 7 ++----- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c index 6fc70318b..8f8f5b6c3 100644 --- a/src/firejail/checkcfg.c +++ b/src/firejail/checkcfg.c @@ -300,6 +300,12 @@ errout: exit(1); } +void print_version(void) { + printf("firejail version %s\n", VERSION); + printf("\n"); + print_compiletime_support(); + printf("\n"); +} void print_compiletime_support(void) { printf("Compile time support:\n"); diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h index 316518534..de11b438d 100644 --- a/src/firejail/firejail.h +++ b/src/firejail/firejail.h @@ -833,6 +833,7 @@ extern char *config_seccomp_filter_add; extern char **whitelist_reject_topdirs; int checkcfg(int val); +void print_version(void); void print_compiletime_support(void); // appimage.c diff --git a/src/firejail/main.c b/src/firejail/main.c index fd96f8bb5..1d90b9fc5 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c @@ -356,10 +356,7 @@ static void run_cmd_and_exit(int i, int argc, char **argv) { exit(0); } else if (strcmp(argv[i], "--version") == 0) { - printf("firejail version %s\n", VERSION); - printf("\n"); - print_compiletime_support(); - printf("\n"); + print_version(); exit(0); } #ifdef HAVE_OVERLAYFS @@ -1082,7 +1079,7 @@ int main(int argc, char **argv, char **envp) { EUID_USER(); if (rv == 0) { if (check_arg(argc, argv, "--version", 1)) { - printf("firejail version %s\n", VERSION); + print_version(); exit(0); } -- cgit v1.2.3-70-g09d2