morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

install: skip later first_word() calls if one of earlier calls passes

Browse Source 
Prompted by CID#1587764, that is false-positive.
This commit is contained in:
Yu Watanabe
2025-07-26 03:24:51 +09:00
parent 635894a493
commit c119eb0edc
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/shared/install.c
View File

@@ -3350,8 +3350,7 @@ static int read_presets(RuntimeScope scope, const char *root_dir, UnitFilePreset
if (strchr(COMMENTS, line[0]))
continue;
parameter = first_word(line, "enable");
if (parameter) {
if ((parameter = first_word(line, "enable"))) {
char *unit_name;
char **instances = NULL;
@@ -3367,10 +3366,8 @@ static int read_presets(RuntimeScope scope, const char *root_dir, UnitFilePreset
.action = PRESET_ENABLE,
.instances = instances,
};
}
parameter = first_word(line, "disable");
if (parameter) {
} else if ((parameter = first_word(line, "disable"))) {
char *pattern;
pattern = strdup(parameter);
@@ -3381,10 +3378,8 @@ static int read_presets(RuntimeScope scope, const char *root_dir, UnitFilePreset
.pattern = pattern,
.action = PRESET_DISABLE,
};
}
parameter = first_word(line, "ignore");
if (parameter) {
} else if ((parameter = first_word(line, "ignore"))) {
char *pattern;
pattern = strdup(parameter);
@@ -3397,7 +3392,7 @@ static int read_presets(RuntimeScope scope, const char *root_dir, UnitFilePreset
};
}
if (rule.action) {
if (rule.action != 0) {
if (!GREEDY_REALLOC(ps.rules, ps.n_rules + 1))
return -ENOMEM;