From a29fd5cac31a634a7859c1b4365a090b636768f7 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Thu, 11 May 2023 19:14:30 -0300 Subject: firejail: deduplicate version printing Split print_version into two functions: * print_version: only prints the version line * print_version_full: also prints compile-time support --- src/firejail/firejail.h | 1 + src/firejail/main.c | 4 ++-- src/firejail/usage.c | 9 ++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h index 7ad7feaf3..d85b470e6 100644 --- a/src/firejail/firejail.h +++ b/src/firejail/firejail.h @@ -478,6 +478,7 @@ void top(void); // usage.c void print_version(void); +void print_version_full(void); void usage(void); // process.c diff --git a/src/firejail/main.c b/src/firejail/main.c index 7e23cdc63..6bb63d26f 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c @@ -369,7 +369,7 @@ static void run_cmd_and_exit(int i, int argc, char **argv) { exit(0); } else if (strcmp(argv[i], "--version") == 0) { - print_version(); + print_version_full(); exit(0); } #ifdef HAVE_OVERLAYFS @@ -1128,7 +1128,7 @@ int main(int argc, char **argv, char **envp) { EUID_USER(); if (rv == 0) { if (check_arg(argc, argv, "--version", 1)) { - print_version(); + print_version_full(); exit(0); } diff --git a/src/firejail/usage.c b/src/firejail/usage.c index a41a6fa1f..8ec868fae 100644 --- a/src/firejail/usage.c +++ b/src/firejail/usage.c @@ -315,13 +315,16 @@ static char *usage_str = "\n"; void print_version(void) { - printf("firejail version %s\n", VERSION); - printf("\n"); + printf("firejail version %s\n\n", VERSION); +} + +void print_version_full(void) { + print_version(); print_compiletime_support(); printf("\n"); } void usage(void) { - printf("firejail version %s\n\n", VERSION); + print_version(); puts(usage_str); } -- cgit v1.2.3-54-g00ecf