diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/firecfg/main.c | 9 | ||||
-rw-r--r-- | src/firemon/firemon.c | 2 | ||||
-rw-r--r-- | src/firemon/firemon.h | 1 | ||||
-rw-r--r-- | src/firemon/usage.c | 6 | ||||
-rw-r--r-- | src/jailcheck/main.c | 7 |
5 files changed, 18 insertions, 7 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 | ||
62 | static void usage(void) { | 62 | static 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 | ||
66 | static void usage(void) { | ||
67 | print_version(); | ||
68 | puts(usage_str); | ||
69 | } | ||
67 | 70 | ||
68 | static void list(void) { | 71 | static 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) { |
diff --git a/src/firemon/firemon.c b/src/firemon/firemon.c index d82f387ff..958fa1b03 100644 --- a/src/firemon/firemon.c +++ b/src/firemon/firemon.c | |||
@@ -145,7 +145,7 @@ int main(int argc, char **argv) { | |||
145 | return 0; | 145 | return 0; |
146 | } | 146 | } |
147 | else if (strcmp(argv[i], "--version") == 0) { | 147 | else if (strcmp(argv[i], "--version") == 0) { |
148 | printf("firemon version %s\n\n", VERSION); | 148 | print_version(); |
149 | return 0; | 149 | return 0; |
150 | } | 150 | } |
151 | else if (strcmp(argv[i], "--debug") == 0) | 151 | else if (strcmp(argv[i], "--debug") == 0) |
diff --git a/src/firemon/firemon.h b/src/firemon/firemon.h index 8b6e75fc3..be83352bb 100644 --- a/src/firemon/firemon.h +++ b/src/firemon/firemon.h | |||
@@ -49,6 +49,7 @@ void firemon_sleep(int st); | |||
49 | void procevent(pid_t pid) __attribute__((noreturn)); | 49 | void procevent(pid_t pid) __attribute__((noreturn)); |
50 | 50 | ||
51 | // usage.c | 51 | // usage.c |
52 | void print_version(void); | ||
52 | void usage(void); | 53 | void usage(void); |
53 | 54 | ||
54 | // top.c | 55 | // top.c |
diff --git a/src/firemon/usage.c b/src/firemon/usage.c index 1cb1b7cfc..0fb9908c5 100644 --- a/src/firemon/usage.c +++ b/src/firemon/usage.c | |||
@@ -78,7 +78,11 @@ static char *help_str = | |||
78 | "Homepage: https://firejail.wordpress.com\n" | 78 | "Homepage: https://firejail.wordpress.com\n" |
79 | "\n"; | 79 | "\n"; |
80 | 80 | ||
81 | void print_version(void) { | ||
82 | printf("firemon version %s\n\n", VERSION); | ||
83 | } | ||
84 | |||
81 | void usage(void) { | 85 | void usage(void) { |
82 | printf("firemon version %s\n", VERSION); | 86 | print_version(); |
83 | puts(help_str); | 87 | puts(help_str); |
84 | } | 88 | } |
diff --git a/src/jailcheck/main.c b/src/jailcheck/main.c index e01f1ca4e..e30ffb274 100644 --- a/src/jailcheck/main.c +++ b/src/jailcheck/main.c | |||
@@ -36,9 +36,12 @@ static char *usage_str = | |||
36 | " --help, -? - this help screen.\n" | 36 | " --help, -? - this help screen.\n" |
37 | " --version - print program version and exit.\n"; | 37 | " --version - print program version and exit.\n"; |
38 | 38 | ||
39 | static void print_version(void) { | ||
40 | printf("jailcheck version %s\n\n", VERSION); | ||
41 | } | ||
39 | 42 | ||
40 | static void usage(void) { | 43 | static void usage(void) { |
41 | printf("jailcheck version %s\n\n", VERSION); | 44 | print_version(); |
42 | puts(usage_str); | 45 | puts(usage_str); |
43 | } | 46 | } |
44 | 47 | ||
@@ -62,7 +65,7 @@ int main(int argc, char **argv) { | |||
62 | return 0; | 65 | return 0; |
63 | } | 66 | } |
64 | else if (strcmp(argv[i], "--version") == 0) { | 67 | else if (strcmp(argv[i], "--version") == 0) { |
65 | printf("firetest version %s\n\n", VERSION); | 68 | print_version(); |
66 | return 0; | 69 | return 0; |
67 | } | 70 | } |
68 | else if (strncmp(argv[i], "--hello=", 8) == 0) { // used by noexec test | 71 | else if (strncmp(argv[i], "--hello=", 8) == 0) { // used by noexec test |