Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

main: Simplify config file search logic

This commit is contained in:
Tim Kourt 2020-04-08 18:44:17 -07:00 committed by Denis Kenzior
parent 98e4f84348
commit a074f30edc
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.c
View File

@ -374,7 +374,6 @@ int main(int argc, char *argv[])
struct l_dbus *dbus; struct l_dbus *dbus;
const char *config_dir; const char *config_dir;
char **config_dirs; char **config_dirs;
int i;
for (;;) { for (;;) {
int opt; int opt;
@ -456,18 +455,18 @@ int main(int argc, char *argv[])
iwd_config = l_settings_new(); iwd_config = l_settings_new();
config_dirs = l_strsplit(config_dir, ':'); config_dirs = l_strsplit(config_dir, ':');
for (i = 0; config_dirs[i]; i++) {
char *path = l_strdup_printf("%s/%s", config_dirs[i],
"main.conf");
bool result = l_settings_load_from_file(iwd_config, path);
l_free(path);
if (result) { for (; *config_dirs; config_dirs++) {
l_info("Loaded configuration from %s/main.conf", L_AUTO_FREE_VAR(char *, path) =
config_dirs[i]); l_strdup_printf("%s/%s", *config_dirs, "main.conf");
break;
} if (!l_settings_load_from_file(iwd_config, path))
continue;
l_info("Loaded configuration from %s", path);
break;
} }
l_strv_free(config_dirs); l_strv_free(config_dirs);
__eapol_set_config(iwd_config); __eapol_set_config(iwd_config);