aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-05-11 19:09:15 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-05-14 16:52:17 -0300
commit1b8e33f734b9d292e735884be54ae03cc361e431 (patch)
treee8535aa3480b1bd421ea56f5988a308985a49147
parentRemove dash before version on --help output (diff)
downloadfirejail-1b8e33f734b9d292e735884be54ae03cc361e431.tar.gz
firejail-1b8e33f734b9d292e735884be54ae03cc361e431.tar.zst
firejail-1b8e33f734b9d292e735884be54ae03cc361e431.zip
firejail: move print_version from checkcfg.c to usage.c
-rw-r--r--src/firejail/checkcfg.c7
-rw-r--r--src/firejail/firejail.h2
-rw-r--r--src/firejail/usage.c6
3 files changed, 7 insertions, 8 deletions
diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c
index a39e8c667..f189ea383 100644
--- a/src/firejail/checkcfg.c
+++ b/src/firejail/checkcfg.c
@@ -305,13 +305,6 @@ errout:
305 exit(1); 305 exit(1);
306} 306}
307 307
308void print_version(void) {
309 printf("firejail version %s\n", VERSION);
310 printf("\n");
311 print_compiletime_support();
312 printf("\n");
313}
314
315void print_compiletime_support(void) { 308void print_compiletime_support(void) {
316 printf("Compile time support:\n"); 309 printf("Compile time support:\n");
317 printf("\t- always force nonewprivs support is %s\n", 310 printf("\t- always force nonewprivs support is %s\n",
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index 2cde75463..7ad7feaf3 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -477,6 +477,7 @@ void tree(void);
477void top(void); 477void top(void);
478 478
479// usage.c 479// usage.c
480void print_version(void);
480void usage(void); 481void usage(void);
481 482
482// process.c 483// process.c
@@ -856,7 +857,6 @@ extern char *config_seccomp_filter_add;
856extern char **whitelist_reject_topdirs; 857extern char **whitelist_reject_topdirs;
857 858
858int checkcfg(int val); 859int checkcfg(int val);
859void print_version(void);
860void print_compiletime_support(void); 860void print_compiletime_support(void);
861 861
862// appimage.c 862// appimage.c
diff --git a/src/firejail/usage.c b/src/firejail/usage.c
index f26ed0034..a41a6fa1f 100644
--- a/src/firejail/usage.c
+++ b/src/firejail/usage.c
@@ -314,6 +314,12 @@ static char *usage_str =
314 "Homepage: https://firejail.wordpress.com\n" 314 "Homepage: https://firejail.wordpress.com\n"
315 "\n"; 315 "\n";
316 316
317void print_version(void) {
318 printf("firejail version %s\n", VERSION);
319 printf("\n");
320 print_compiletime_support();
321 printf("\n");
322}
317 323
318void usage(void) { 324void usage(void) {
319 printf("firejail version %s\n\n", VERSION); 325 printf("firejail version %s\n\n", VERSION);