fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid deadlock in config_save()

Browse Source 
Must not exit with nbar.mutex locked.

Addresses GitHub issue #201.

Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lars Henriksen 2019-03-17 20:41:05 +01:00 committed by Lukas Fleischer
parent d26164fb72
commit 78a46ac7cb
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/config.c
View File

@ -633,9 +633,9 @@ static int config_load_cb(const char *key, const char *value, void *dummy)
int result = config_set_conf(key, value); int result = config_set_conf(key, value);
if (result < 0) { if (result < 0) {
WARN_MSG(_("unknown user option: \"%s\""), key); WARN_MSG(_("unknown user option: \"%s\" (ignored)"), key);
} else if (result == 0) { } else if (result == 0) {
WARN_MSG(_("invalid option format: \"%s\""), key); WARN_MSG(_("invalid option format: \"%s\" (ignored)"), key);
} }
return 1; return 1;
@ -655,12 +655,13 @@ static int config_save_cb(const char *key, const char *value, void *status)
(struct config_save_status *)status); (struct config_save_status *)status);
if (result < 0) { if (result < 0) {
EXIT(_("configuration variable unknown: \"%s\""), key); WARN_MSG(_("unknown user option: \"%s\" (disabled)"), key);
/* NOTREACHED */
} else if (result == 0) { } else if (result == 0) {
EXIT(_("wrong configuration variable format for \"%s\""), WARN_MSG(_("invalid option format: \"%s\" (disabled)"), key);
key); }
/* NOTREACHED */ if (result <= 0) {
fputc('#', ((struct config_save_status *)status)->fp);
buf = mem_strdup(value);
} }
fputs(key, ((struct config_save_status *)status)->fp); fputs(key, ((struct config_save_status *)status)->fp);