pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

main: refactor

Browse source
This commit is contained in:
Daniel Eklöf 2019-01-16 17:22:08 +01:00
parent b195c19599
commit dc7fde335e
1 changed files with 44 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
main.c
View file

@ -51,25 +51,46 @@ get_config_path(void)
return path; return path;
} }
static FILE * static struct bar *
open_config(const char *path) load_bar(const char *config_path)
{ {
FILE *ret = fopen(path, "r"); FILE *conf_file = fopen(config_path, "r");
if (ret == NULL) if (conf_file == NULL) {
LOG_ERRNO("%s: failed to open", path); LOG_ERRNO("%s: failed to open", config_path);
return NULL;
}
return ret; struct bar *bar = NULL;
char *yml_error = NULL;
struct yml_node *conf = yml_load(conf_file, &yml_error);
if (conf == NULL) {
LOG_ERR("%s:%s", config_path, yml_error);
goto out;
}
const struct yml_node *bar_conf = yml_get_value(conf, "bar");
if (bar_conf == NULL) {
LOG_ERR("%s: missing required top level key 'bar'", config_path);
goto out;
}
bar = conf_to_bar(bar_conf);
if (bar == NULL) {
LOG_ERR("%s: failed to load configuration", config_path);
goto out;
}
out:
free(yml_error);
yml_destroy(conf);
fclose(conf_file);
return bar;
} }
int int
main(int argc, const char *const *argv) main(int argc, const char *const *argv)
{ {
int abort_fd = eventfd(0, EFD_CLOEXEC);
if (abort_fd == -1) {
LOG_ERRNO("failed to create eventfd (for abort signalling)");
return 1;
}
const struct sigaction sa = {.sa_handler = &signal_handler}; const struct sigaction sa = {.sa_handler = &signal_handler};
sigaction(SIGINT, &sa, NULL); sigaction(SIGINT, &sa, NULL);
sigaction(SIGTERM, &sa, NULL); sigaction(SIGTERM, &sa, NULL);
@ -82,41 +103,21 @@ main(int argc, const char *const *argv)
sigaddset(&signal_mask, SIGTERM); sigaddset(&signal_mask, SIGTERM);
pthread_sigmask(SIG_BLOCK, &signal_mask, NULL); pthread_sigmask(SIG_BLOCK, &signal_mask, NULL);
int abort_fd = eventfd(0, EFD_CLOEXEC);
if (abort_fd == -1) {
LOG_ERRNO("failed to create eventfd (for abort signalling)");
return 1;
}
char *config_path = get_config_path(); char *config_path = get_config_path();
FILE *conf_file = open_config(config_path);
if (conf_file == NULL) {
free(config_path);
return 1;
}
char *yml_error;
struct yml_node *conf = yml_load(conf_file, &yml_error);
fclose(conf_file);
if (conf == NULL) {
LOG_ERR("%s:%s", config_path, yml_error);
free(yml_error);
free(config_path);
return 1;
}
const struct yml_node *bar_conf = yml_get_value(conf, "bar");
if (bar_conf == NULL) {
LOG_ERR("%s: missing required top level key 'bar'", config_path);
free(config_path);
return 1;
}
struct bar *bar = conf_to_bar(bar_conf);
if (bar == NULL) {
LOG_ERR("%s: failed to load configuration", config_path);
free(config_path);
return 1;
}
struct bar *bar = load_bar(config_path);
free(config_path); free(config_path);
if (bar == NULL) {
close(abort_fd);
return 1;
}
xcb_init(); xcb_init();
@ -166,8 +167,6 @@ main(int argc, const char *const *argv)
LOG_ERRNO_P("failed to join bar thread", r); LOG_ERRNO_P("failed to join bar thread", r);
bar->destroy(bar); bar->destroy(bar);
yml_destroy(conf);
close(abort_fd); close(abort_fd);
return res; return res;
} }