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

macros.c: fix whitespace after if in expand_macros()

Browse source
This commit is contained in:
Kelvin M. Klann 2026-04-21 04:12:00 -03:00
parent d9739c6d55
commit 1155e0da0f
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/firejail/macros.c
View file

@ -200,10 +200,10 @@ char *expand_macros(const char *path) {
int called_as_root = 0; int called_as_root = 0;
if(geteuid() == 0) if (geteuid() == 0)
called_as_root = 1; called_as_root = 1;
if(called_as_root) { if (called_as_root) {
EUID_USER(); EUID_USER();
} }
@ -218,28 +218,28 @@ char *expand_macros(const char *path) {
else if (strncmp(path, "${HOME}", 7) == 0) { else if (strncmp(path, "${HOME}", 7) == 0) {
if (asprintf(&new_name, "%s%s", cfg.homedir, path + 7) == -1) if (asprintf(&new_name, "%s%s", cfg.homedir, path + 7) == -1)
errExit("asprintf"); errExit("asprintf");
if(called_as_root) if (called_as_root)
EUID_ROOT(); EUID_ROOT();
return new_name; return new_name;
} }
else if (*path == '~') { else if (*path == '~') {
if (asprintf(&new_name, "%s%s", cfg.homedir, path + 1) == -1) if (asprintf(&new_name, "%s%s", cfg.homedir, path + 1) == -1)
errExit("asprintf"); errExit("asprintf");
if(called_as_root) if (called_as_root)
EUID_ROOT(); EUID_ROOT();
return new_name; return new_name;
} }
else if (strncmp(path, "${CFG}", 6) == 0) { else if (strncmp(path, "${CFG}", 6) == 0) {
if (asprintf(&new_name, "%s%s", SYSCONFDIR, path + 6) == -1) if (asprintf(&new_name, "%s%s", SYSCONFDIR, path + 6) == -1)
errExit("asprintf"); errExit("asprintf");
if(called_as_root) if (called_as_root)
EUID_ROOT(); EUID_ROOT();
return new_name; return new_name;
} }
else if (strncmp(path, "${RUNUSER}", 10) == 0) { else if (strncmp(path, "${RUNUSER}", 10) == 0) {
if (asprintf(&new_name, "/run/user/%u%s", getuid(), path + 10) == -1) if (asprintf(&new_name, "/run/user/%u%s", getuid(), path + 10) == -1)
errExit("asprintf"); errExit("asprintf");
if(called_as_root) if (called_as_root)
EUID_ROOT(); EUID_ROOT();
return new_name; return new_name;
} }
@ -248,7 +248,7 @@ char *expand_macros(const char *path) {
if (directory) { if (directory) {
if (asprintf(&new_name, "%s/%s", cfg.homedir, directory) == -1) if (asprintf(&new_name, "%s/%s", cfg.homedir, directory) == -1)
errExit("asprintf"); errExit("asprintf");
if(called_as_root) if (called_as_root)
EUID_ROOT(); EUID_ROOT();
free(directory); free(directory);
return new_name; return new_name;
@ -259,7 +259,7 @@ char *expand_macros(const char *path) {
if (!rv) if (!rv)
errExit("strdup"); errExit("strdup");
if(called_as_root) if (called_as_root)
EUID_ROOT(); EUID_ROOT();
return rv; return rv;