alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Revert "Restore CWD if returning early."

Browse source 
This reverts commit 921e42c6c0.
This commit is contained in:
Drew DeVault 2019-02-07 21:22:53 -05:00 committed by GitHub
parent ec5da0ca5b
commit 385cf330ae
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sway/config.c
View file

@ -557,13 +557,17 @@ 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;
@ -571,7 +575,10 @@ bool load_include_configs(const char *path, struct sway_config *config,
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); bool found = load_include_config(w[i], parent_dir, config, swaynag);
if (!found) { if (!found) {
goto error_not_found; wordfree(&p);
free(parent_path);
free(wd);
return false;
} }
} }
free(parent_path); free(parent_path);
@ -586,16 +593,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) {