external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-23 12:35:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

main: print a descriptive error message when yaml parsing fails

Browse source
This commit is contained in:
Daniel Eklöf 2019-01-01 23:26:10 +01:00
parent 5abd825137
commit 4d46a14a67
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
main.c
View file

@ -29,8 +29,8 @@ signal_handler(int signo)
aborted = 1; aborted = 1;
} }
static FILE * static char *
open_config(void) get_config_path(void)
{ {
struct passwd *passwd = getpwuid(getuid()); struct passwd *passwd = getpwuid(getuid());
if (passwd == NULL) { if (passwd == NULL) {
@ -45,9 +45,14 @@ open_config(void)
if (path_max == -1) if (path_max == -1)
path_max = 1024; path_max = 1024;
char path[path_max]; char *path = malloc(path_max + 1);
snprintf(path, path_max, "%s/.config/f00bar/config.yml", home_dir); snprintf(path, path_max + 1, "%s/.config/f00bar/config.yml", home_dir);
return path;
}
static FILE *
open_config(const char *path)
{
FILE *ret = fopen(path, "r"); FILE *ret = fopen(path, "r");
if (ret == NULL) if (ret == NULL)
LOG_ERRNO("%s: failed to open", path); LOG_ERRNO("%s: failed to open", path);
@ -58,16 +63,26 @@ open_config(void)
int int
main(int argc, const char *const *argv) main(int argc, const char *const *argv)
{ {
FILE *conf_file = open_config(); char *config_path = get_config_path();
if (conf_file == NULL) FILE *conf_file = open_config(config_path);
if (conf_file == NULL) {
free(config_path);
return 1; return 1;
}
char *yml_error; char *yml_error;
struct yml_node *conf = yml_load(conf_file, &yml_error); struct yml_node *conf = yml_load(conf_file, &yml_error);
fclose(conf_file); fclose(conf_file);
if (conf == NULL) if (conf == NULL) {
LOG_ERR("%s:%s", config_path, yml_error);
free(yml_error);
free(config_path);
return 1; return 1;
}
free(config_path);
xcb_init(); xcb_init();