aboutsummaryrefslogtreecommitdiffstats
path: root/src/firecfg
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-05-11 14:36:11 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-05-14 16:52:49 -0300
commit727da58819051dccaa6df3304042de93c6a9876d (patch)
tree956e70fe4579ea6aef7e85c0be0b8a43f6327001 /src/firecfg
parentfirejail: simplify print_compiletime_support function (diff)
downloadfirejail-727da58819051dccaa6df3304042de93c6a9876d.tar.gz
firejail-727da58819051dccaa6df3304042de93c6a9876d.tar.zst
firejail-727da58819051dccaa6df3304042de93c6a9876d.zip
Standardize version output
Changes: * Only print the version line in the print_version function * Add a print_version function where missing (put it in usage.c if the file exists) * Always a blank line after the version
Diffstat (limited to 'src/firecfg')
-rw-r--r--src/firecfg/main.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/firecfg/main.c b/src/firecfg/main.c
index 0725ca79f..c9dc27b1b 100644
--- a/src/firecfg/main.c
+++ b/src/firecfg/main.c
@@ -59,11 +59,14 @@ static char *usage_str =
59 "License GPL version 2 or later\n" 59 "License GPL version 2 or later\n"
60 "Homepage: https://firejail.wordpress.com\n\n"; 60 "Homepage: https://firejail.wordpress.com\n\n";
61 61
62static void usage(void) { 62static void print_version(void) {
63 printf("firecfg version %s\n\n", VERSION); 63 printf("firecfg version %s\n\n", VERSION);
64 puts(usage_str);
65} 64}
66 65
66static void usage(void) {
67 print_version();
68 puts(usage_str);
69}
67 70
68static void list(void) { 71static void list(void) {
69 DIR *dir = opendir(arg_bindir); 72 DIR *dir = opendir(arg_bindir);
@@ -364,7 +367,7 @@ int main(int argc, char **argv) {
364 else if (strcmp(argv[i], "--debug") == 0) 367 else if (strcmp(argv[i], "--debug") == 0)
365 arg_debug = 1; 368 arg_debug = 1;
366 else if (strcmp(argv[i], "--version") == 0) { 369 else if (strcmp(argv[i], "--version") == 0) {
367 printf("firecfg version %s\n\n", VERSION); 370 print_version();
368 return 0; 371 return 0;
369 } 372 }
370 else if (strcmp(argv[i], "--clean") == 0) { 373 else if (strcmp(argv[i], "--clean") == 0) {