mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-14 14:34:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3619 from swaywm/revert-3595-ErrorIfConfigNotExist

Browse Source 
Revert "Return false if config could not be loaded."
This commit is contained in:
Drew DeVault 2019-02-08 03:30:11 +01:00 committed by GitHub
commit f00fbe6861
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sway/config.c
View File

@ -557,22 +557,23 @@ bool load_include_configs(const char *path, struct sway_config *config,
const char *parent_dir = dirname(parent_path); const char *parent_dir = dirname(parent_path);
if (chdir(parent_dir) < 0) { if (chdir(parent_dir) < 0) {
goto error_chdir; free(parent_path);
free(wd);
return false;
} }
wordexp_t p; wordexp_t p;
if (wordexp(path, &p, 0) != 0) { if (wordexp(path, &p, 0) != 0) {
goto error_wordexp; free(parent_path);
free(wd);
return false;
} }
char **w = p.we_wordv; char **w = p.we_wordv;
size_t i; size_t i;
for (i = 0; i < p.we_wordc; ++i) { for (i = 0; i < p.we_wordc; ++i) {
bool found = load_include_config(w[i], parent_dir, config, swaynag); load_include_config(w[i], parent_dir, config, swaynag);
if (!found) {
goto error_not_found;
}
} }
free(parent_path); free(parent_path);
wordfree(&p); wordfree(&p);
@ -586,16 +587,6 @@ bool load_include_configs(const char *path, struct sway_config *config,
free(wd); free(wd);
return true; return true;
error_not_found:
wordfree(&p);
error_wordexp:
if (chdir(wd) < 0) {
sway_log(SWAY_ERROR, "failed to restore working directory");
}
error_chdir:
free(parent_path);
free(wd);
return false;
} }
void run_deferred_commands(void) { void run_deferred_commands(void) {