github-starred/firejail
2
0
Fork 0
mirror of https://github.com/netblue30/firejail.git synced 2026-05-15 14:16:14 -06:00
Code Issues 531 Projects Packages Wiki Activity Actions 6

modif: check for --version during early init

Browse source 
Move it from `run_cmd_and_exit()` to right after the --quiet/--debug
checks.

This simplifies the sandbox check code by removing its own --version
check.

See also commit 5cd597e5d ("fix --version", 2016-06-28).

This is a follow-up to #6969.
This commit is contained in:
Kelvin M. Klann 2025-11-23 02:15:54 -03:00
parent 7cd56fa47d
commit 907916d045
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/firejail/main.c
View file

@ -375,10 +375,6 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
usage();
exit(0);
}
else if (strcmp(argv[i], "--version") == 0) {
print_version_full();
exit(0);
}
#ifdef HAVE_OVERLAYFS
else if (strcmp(argv[i], "--overlay-clean") == 0) {
if (checkcfg(CFG_OVERLAYFS)) {
@ -1092,6 +1088,12 @@ int main(int argc, char **argv, char **envp) {
arg_quiet = 0;
}
// process --version
if (check_arg(argc, argv, "--version", 1)) {
print_version_full();
exit(0);
}
// initialize values from firejail.config (needed for arg/env checks)
checkcfg(0);
@ -1144,11 +1146,6 @@ int main(int argc, char **argv, char **envp) {
int rv = check_kernel_procs();
EUID_USER();
if (rv == 0) {
if (check_arg(argc, argv, "--version", 1)) {
print_version_full();
exit(0);
}
// start the program directly without sandboxing
run_no_sandbox(argc, argv);
__builtin_unreachable();