Skip to content

M
mpd
Commit 06d5d4b0 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

conf: handle fatal errors with GError

Don't call g_error(), which will abort the process and dump core. This patch does not affect all the config_get_X() functions. These need some more refactoring.
parent f3739a73
Show whitespace changes
Inline Side-by-side
Showing with 126 additions and 48 deletions
src/cmdline.c
View file @ 06d5d4b0
...@@ -152,21 +152,20 @@ parse_cmdline(int argc, char **argv, struct options *options, ...@@ -152,21 +152,20 @@ parse_cmdline(int argc, char **argv, struct options *options,
path2 = g_build_filename(g_get_home_dir(), path2 = g_build_filename(g_get_home_dir(),
USER_CONFIG_FILE_LOCATION2, NULL); USER_CONFIG_FILE_LOCATION2, NULL);
if (g_file_test(path1, G_FILE_TEST_IS_REGULAR)) if (g_file_test(path1, G_FILE_TEST_IS_REGULAR))
config_read_file(path1); ret = config_read_file(path1, error_r);
else if (g_file_test(path2, G_FILE_TEST_IS_REGULAR)) else if (g_file_test(path2, G_FILE_TEST_IS_REGULAR))
config_read_file(path2); ret = config_read_file(path2, error_r);
else if (g_file_test(SYSTEM_CONFIG_FILE_LOCATION, else if (g_file_test(SYSTEM_CONFIG_FILE_LOCATION,
G_FILE_TEST_IS_REGULAR)) G_FILE_TEST_IS_REGULAR))
config_read_file(SYSTEM_CONFIG_FILE_LOCATION); ret = config_read_file(SYSTEM_CONFIG_FILE_LOCATION,
error_r);
g_free(path1); g_free(path1);
g_free(path2); g_free(path2);
return true; return ret;
} else if (argc == 2) { } else if (argc == 2) {
/* specified configuration file */ /* specified configuration file */
config_read_file(argv[1]); return config_read_file(argv[1], error_r);
return true;
} else { } else {
g_set_error(error_r, cmdline_quark(), 0, g_set_error(error_r, cmdline_quark(), 0,
"too many arguments"); "too many arguments");
......
src/conf.c
View file @ 06d5d4b0
...@@ -221,17 +221,20 @@ void config_global_check(void) ...@@ -221,17 +221,20 @@ void config_global_check(void)
} }
} }
void bool
config_add_block_param(struct config_param * param, const char *name, config_add_block_param(struct config_param * param, const char *name,
const char *value, int line) const char *value, int line, GError **error_r)
{ {
struct block_param *bp; struct block_param *bp;
bp = config_get_block_param(param, name); bp = config_get_block_param(param, name);
if (bp != NULL) if (bp != NULL) {
g_error("\"%s\" first defined on line %i, and " g_set_error(error_r, config_quark(), 0,
"\"%s\" first defined on line %i, and "
"redefined on line %i\n", name, "redefined on line %i\n", name,
bp->line, line); bp->line, line);
return false;
}
param->num_block_params++; param->num_block_params++;
...@@ -245,21 +248,28 @@ config_add_block_param(struct config_param * param, const char *name, ...@@ -245,21 +248,28 @@ config_add_block_param(struct config_param * param, const char *name,
bp->value = g_strdup(value); bp->value = g_strdup(value);
bp->line = line; bp->line = line;
bp->used = false; bp->used = false;
return true;
} }
static struct config_param * static struct config_param *
config_read_block(FILE *fp, int *count, char *string) config_read_block(FILE *fp, int *count, char *string, GError **error_r)
{ {
struct config_param *ret = config_new_param(NULL, *count); struct config_param *ret = config_new_param(NULL, *count);
GError *error = NULL;
bool success;
while (true) { while (true) {
char *line; char *line;
const char *name, *value; const char *name, *value;
GError *error = NULL;
line = fgets(string, MAX_STRING_SIZE, fp); line = fgets(string, MAX_STRING_SIZE, fp);
if (line == NULL) if (line == NULL) {
g_error("Expected '}' before end-of-file"); config_param_free(ret);
g_set_error(error_r, config_quark(), 0,
"Expected '}' before end-of-file");
return NULL;
}
(*count)++; (*count)++;
line = g_strchug(line); line = g_strchug(line);
...@@ -271,9 +281,13 @@ config_read_block(FILE *fp, int *count, char *string) ...@@ -271,9 +281,13 @@ config_read_block(FILE *fp, int *count, char *string)
(and from this "while" loop) */ (and from this "while" loop) */
line = g_strchug(line + 1); line = g_strchug(line + 1);
if (*line != 0 && *line != CONF_COMMENT) if (*line != 0 && *line != CONF_COMMENT) {
g_error("line %i: Unknown tokens after '}'", config_param_free(ret);
g_set_error(error_r, config_quark(), 0,
"line %i: Unknown tokens after '}'",
*count); *count);
return false;
}
return ret; return ret;
} }
...@@ -283,25 +297,44 @@ config_read_block(FILE *fp, int *count, char *string) ...@@ -283,25 +297,44 @@ config_read_block(FILE *fp, int *count, char *string)
name = tokenizer_next_word(&line, &error); name = tokenizer_next_word(&line, &error);
if (name == NULL) { if (name == NULL) {
assert(*line != 0); assert(*line != 0);
g_error("line %i: %s", *count, error->message); config_param_free(ret);
g_propagate_prefixed_error(error_r, error,
"line %i: ", *count);
return NULL;
} }
value = tokenizer_next_string(&line, &error); value = tokenizer_next_string(&line, &error);
if (value == NULL) { if (value == NULL) {
config_param_free(ret);
if (*line == 0) if (*line == 0)
g_error("line %i: Value missing", *count); g_set_error(error_r, config_quark(), 0,
"line %i: Value missing", *count);
else else
g_error("line %i: %s", *count, error->message); g_propagate_prefixed_error(error_r, error,
"line %i: ",
*count);
return NULL;
} }
if (*line != 0 && *line != CONF_COMMENT) if (*line != 0 && *line != CONF_COMMENT) {
g_error("line %i: Unknown tokens after value", *count); config_param_free(ret);
g_set_error(error_r, config_quark(), 0,
"line %i: Unknown tokens after value",
*count);
return NULL;
}
config_add_block_param(ret, name, value, *count); success = config_add_block_param(ret, name, value, *count,
error_r);
if (!success) {
config_param_free(ret);
return false;
}
} }
} }
void config_read_file(const char *file) bool
config_read_file(const char *file, GError **error_r)
{ {
FILE *fp; FILE *fp;
char string[MAX_STRING_SIZE + 1]; char string[MAX_STRING_SIZE + 1];
...@@ -312,8 +345,10 @@ void config_read_file(const char *file) ...@@ -312,8 +345,10 @@ void config_read_file(const char *file)
g_debug("loading file %s", file); g_debug("loading file %s", file);
if (!(fp = fopen(file, "r"))) { if (!(fp = fopen(file, "r"))) {
g_error("problems opening file %s for reading: %s\n", g_set_error(error_r, config_quark(), errno,
"Failed to open %s: %s",
file, strerror(errno)); file, strerror(errno));
return false;
} }
while (fgets(string, MAX_STRING_SIZE, fp)) { while (fgets(string, MAX_STRING_SIZE, fp)) {
...@@ -333,22 +368,29 @@ void config_read_file(const char *file) ...@@ -333,22 +368,29 @@ void config_read_file(const char *file)
name = tokenizer_next_word(&line, &error); name = tokenizer_next_word(&line, &error);
if (name == NULL) { if (name == NULL) {
assert(*line != 0); assert(*line != 0);
g_error("line %i: %s", count, error->message); g_propagate_prefixed_error(error_r, error,
"line %i: ", count);
return false;
} }
/* get the definition of that option, and check the /* get the definition of that option, and check the
"repeatable" flag */ "repeatable" flag */
entry = config_entry_get(name); entry = config_entry_get(name);
if (entry == NULL) if (entry == NULL) {
g_error("unrecognized parameter in config file at " g_set_error(error_r, config_quark(), 0,
"unrecognized parameter in config file at "
"line %i: %s\n", count, name); "line %i: %s\n", count, name);
return false;
}
if (entry->params != NULL && !entry->repeatable) { if (entry->params != NULL && !entry->repeatable) {
param = entry->params->data; param = entry->params->data;
g_error("config parameter \"%s\" is first defined on " g_set_error(error_r, config_quark(), 0,
"line %i and redefined on line %i\n", "config parameter \"%s\" is first defined "
"on line %i and redefined on line %i\n",
name, param->line, count); name, param->line, count);
return false;
} }
/* now parse the block or the value */ /* now parse the block or the value */
...@@ -356,31 +398,48 @@ void config_read_file(const char *file) ...@@ -356,31 +398,48 @@ void config_read_file(const char *file)
if (entry->block) { if (entry->block) {
/* it's a block, call config_read_block() */ /* it's a block, call config_read_block() */
if (*line != '{') if (*line != '{') {
g_error("line %i: '{' expected", count); g_set_error(error_r, config_quark(), 0,
"line %i: '{' expected", count);
return false;
}
line = g_strchug(line + 1); line = g_strchug(line + 1);
if (*line != 0 && *line != CONF_COMMENT) if (*line != 0 && *line != CONF_COMMENT) {
g_error("line %i: Unknown tokens after '{'", g_set_error(error_r, config_quark(), 0,
"line %i: Unknown tokens after '{'",
count); count);
return false;
}
param = config_read_block(fp, &count, string); param = config_read_block(fp, &count, string, error_r);
if (param == NULL)
return false;
} else { } else {
/* a string value */ /* a string value */
value = tokenizer_next_string(&line, &error); value = tokenizer_next_string(&line, &error);
if (value == NULL) { if (value == NULL) {
if (*line == 0) if (*line == 0)
g_error("line %i: Value missing", g_set_error(error_r, config_quark(), 0,
"line %i: Value missing",
count); count);
else else {
g_error("line %i: %s", count, g_set_error(error_r, config_quark(), 0,
"line %i: %s", count,
error->message); error->message);
g_error_free(error);
}
return false;
} }
if (*line != 0 && *line != CONF_COMMENT) if (*line != 0 && *line != CONF_COMMENT) {
g_error("line %i: Unknown tokens after value", g_set_error(error_r, config_quark(), 0,
"line %i: Unknown tokens after value",
count); count);
return false;
}
param = config_new_param(value, count); param = config_new_param(value, count);
} }
...@@ -388,6 +447,8 @@ void config_read_file(const char *file) ...@@ -388,6 +447,8 @@ void config_read_file(const char *file)
entry->params = g_slist_append(entry->params, param); entry->params = g_slist_append(entry->params, param);
} }
fclose(fp); fclose(fp);
return true;
} }
struct config_param * struct config_param *
......
src/conf.h
View file @ 06d5d4b0
...@@ -116,7 +116,8 @@ void config_global_finish(void); ...@@ -116,7 +116,8 @@ void config_global_finish(void);
*/ */
void config_global_check(void); void config_global_check(void);
void config_read_file(const char *file); bool
config_read_file(const char *file, GError **error_r);
/* don't free the returned value /* don't free the returned value
set _last_ to NULL to get first entry */ set _last_ to NULL to get first entry */
...@@ -192,8 +193,8 @@ config_get_block_bool(const struct config_param *param, const char *name, ...@@ -192,8 +193,8 @@ config_get_block_bool(const struct config_param *param, const char *name,
struct config_param * struct config_param *
config_new_param(const char *value, int line); config_new_param(const char *value, int line);
void bool
config_add_block_param(struct config_param *param, const char *name, config_add_block_param(struct config_param * param, const char *name,
const char *value, int line); const char *value, int line, GError **error_r);
#endif #endif
test/read_conf.c
View file @ 06d5d4b0
...@@ -37,6 +37,8 @@ my_log_func(G_GNUC_UNUSED const gchar *log_domain, ...@@ -37,6 +37,8 @@ my_log_func(G_GNUC_UNUSED const gchar *log_domain,
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
const char *path, *name, *value; const char *path, *name, *value;
GError *error = NULL;
bool success;
int ret; int ret;
if (argc != 3) { if (argc != 3) {
...@@ -50,7 +52,12 @@ int main(int argc, char **argv) ...@@ -50,7 +52,12 @@ int main(int argc, char **argv)
g_log_set_default_handler(my_log_func, NULL); g_log_set_default_handler(my_log_func, NULL);
config_global_init(); config_global_init();
config_read_file(path); success = config_read_file(path, &error);
if (!success) {
g_printerr("%s:", error->message);
g_error_free(error);
return 1;
}
value = config_get_string(name, NULL); value = config_get_string(name, NULL);
if (value != NULL) { if (value != NULL) {
......
test/run_encoder.c
View file @ 06d5d4b0
...@@ -73,7 +73,7 @@ int main(int argc, char **argv) ...@@ -73,7 +73,7 @@ int main(int argc, char **argv)
} }
param = config_new_param(NULL, -1); param = config_new_param(NULL, -1);
config_add_block_param(param, "quality", "5.0", -1); config_add_block_param(param, "quality", "5.0", -1, NULL);
encoder = encoder_init(plugin, param, &error); encoder = encoder_init(plugin, param, &error);
if (encoder == NULL) { if (encoder == NULL) {
......
test/run_filter.c
View file @ 06d5d4b0
...@@ -90,7 +90,12 @@ int main(int argc, char **argv) ...@@ -90,7 +90,12 @@ int main(int argc, char **argv)
/* read configuration file (mpd.conf) */ /* read configuration file (mpd.conf) */
config_global_init(); config_global_init();
config_read_file(argv[1]); success = config_read_file(argv[1], &error);
if (!success) {
g_printerr("%s:", error->message);
g_error_free(error);
return 1;
}
/* parse the audio format */ /* parse the audio format */
......
test/run_output.c
View file @ 06d5d4b0
...@@ -122,7 +122,12 @@ int main(int argc, char **argv) ...@@ -122,7 +122,12 @@ int main(int argc, char **argv)
/* read configuration file (mpd.conf) */ /* read configuration file (mpd.conf) */
config_global_init(); config_global_init();
config_read_file(argv[1]); success = config_read_file(argv[1], &error);
if (!success) {
g_printerr("%s:", error->message);
g_error_free(error);
return 1;
}
/* initialize the audio output */ /* initialize the audio output */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment