diff options
Diffstat (limited to '')
| -rw-r--r-- | src/ConfigData.cxx | 186 | ||||
| -rw-r--r-- | src/ConfigData.hxx | 106 | ||||
| -rw-r--r-- | src/ConfigFile.cxx | 167 | ||||
| -rw-r--r-- | src/ConfigParser.cxx | 43 | ||||
| -rw-r--r-- | src/ConfigParser.hxx | 26 | ||||
| -rw-r--r-- | src/conf.h | 74 |
6 files changed, 363 insertions, 239 deletions
diff --git a/src/ConfigData.cxx b/src/ConfigData.cxx new file mode 100644 index 000000000..8228940e5 --- /dev/null +++ b/src/ConfigData.cxx @@ -0,0 +1,186 @@ +/* + * Copyright (C) 2003-2013 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "ConfigData.hxx" +#include "ConfigParser.hxx" +#include "mpd_error.h" + +extern "C" { +#include "utils.h" +} + +#include <glib.h> + +#include <assert.h> +#include <string.h> +#include <stdlib.h> + +struct config_param * +config_new_param(const char *value, int line) +{ + struct config_param *ret = g_new(struct config_param, 1); + + if (!value) + ret->value = NULL; + else + ret->value = g_strdup(value); + + ret->line = line; + + ret->num_block_params = 0; + ret->block_params = NULL; + ret->used = false; + + return ret; +} + +void +config_param_free(struct config_param *param) +{ + g_free(param->value); + + for (unsigned i = 0; i < param->num_block_params; i++) { + g_free(param->block_params[i].name); + g_free(param->block_params[i].value); + } + + if (param->num_block_params) + g_free(param->block_params); + + g_free(param); +} + +void +config_add_block_param(struct config_param * param, const char *name, + const char *value, int line) +{ + struct block_param *bp; + + assert(config_get_block_param(param, name) == NULL); + + param->num_block_params++; + + param->block_params = (struct block_param *) + g_realloc(param->block_params, + param->num_block_params * + sizeof(param->block_params[0])); + + bp = ¶m->block_params[param->num_block_params - 1]; + + bp->name = g_strdup(name); + bp->value = g_strdup(value); + bp->line = line; + bp->used = false; +} + +const struct block_param * +config_get_block_param(const struct config_param * param, const char *name) +{ + if (param == NULL) + return NULL; + + for (unsigned i = 0; i < param->num_block_params; i++) { + if (0 == strcmp(name, param->block_params[i].name)) { + struct block_param *bp = ¶m->block_params[i]; + bp->used = true; + return bp; + } + } + + return NULL; +} + +const char * +config_get_block_string(const struct config_param *param, const char *name, + const char *default_value) +{ + const struct block_param *bp = config_get_block_param(param, name); + + if (bp == NULL) + return default_value; + + return bp->value; +} + +char * +config_dup_block_string(const struct config_param *param, const char *name, + const char *default_value) +{ + return g_strdup(config_get_block_string(param, name, default_value)); +} + +char * +config_dup_block_path(const struct config_param *param, const char *name, + GError **error_r) +{ + assert(error_r != NULL); + assert(*error_r == NULL); + + const struct block_param *bp = config_get_block_param(param, name); + if (bp == NULL) + return NULL; + + char *path = parsePath(bp->value, error_r); + if (G_UNLIKELY(path == NULL)) + g_prefix_error(error_r, + "Invalid path in \"%s\" at line %i: ", + name, bp->line); + + return path; +} + +unsigned +config_get_block_unsigned(const struct config_param *param, const char *name, + unsigned default_value) +{ + const struct block_param *bp = config_get_block_param(param, name); + long value; + char *endptr; + + if (bp == NULL) + return default_value; + + value = strtol(bp->value, &endptr, 0); + if (*endptr != 0) + MPD_ERROR("Not a valid number in line %i", bp->line); + + if (value < 0) + MPD_ERROR("Not a positive number in line %i", bp->line); + + return (unsigned)value; +} + +bool +config_get_block_bool(const struct config_param *param, const char *name, + bool default_value) +{ + const struct block_param *bp = config_get_block_param(param, name); + bool success, value; + + if (bp == NULL) + return default_value; + + success = get_bool(bp->value, &value); + if (!success) + MPD_ERROR("%s is not a boolean value (yes, true, 1) or " + "(no, false, 0) on line %i\n", + name, bp->line); + + return value; +} diff --git a/src/ConfigData.hxx b/src/ConfigData.hxx new file mode 100644 index 000000000..d156cef18 --- /dev/null +++ b/src/ConfigData.hxx @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2003-2013 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_CONFIG_DATA_HXX +#define MPD_CONFIG_DATA_HXX + +#include "gerror.h" +#include "gcc.h" + +#include <stdbool.h> + +struct block_param { + char *name; + char *value; + int line; + + /** + * This flag is false when nobody has queried the value of + * this option yet. + */ + bool used; +}; + +struct config_param { + char *value; + unsigned int line; + + struct block_param *block_params; + unsigned num_block_params; + + /** + * This flag is false when nobody has queried the value of + * this option yet. + */ + bool used; +}; + +#ifdef __cplusplus +extern "C" { +#endif + +gcc_malloc +struct config_param * +config_new_param(const char *value, int line); + +void +config_param_free(struct config_param *param); + +void +config_add_block_param(struct config_param * param, const char *name, + const char *value, int line); + +gcc_pure +const struct block_param * +config_get_block_param(const struct config_param *param, const char *name); + +gcc_pure +const char * +config_get_block_string(const struct config_param *param, const char *name, + const char *default_value); + +gcc_malloc +char * +config_dup_block_string(const struct config_param *param, const char *name, + const char *default_value); + +/** + * Same as config_dup_path(), but looks up the setting in the + * specified block. + */ +gcc_malloc +char * +config_dup_block_path(const struct config_param *param, const char *name, + GError **error_r); + +gcc_pure +unsigned +config_get_block_unsigned(const struct config_param *param, const char *name, + unsigned default_value); + +gcc_pure +bool +config_get_block_bool(const struct config_param *param, const char *name, + bool default_value); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/ConfigFile.cxx b/src/ConfigFile.cxx index ee2501ffc..af619c0b2 100644 --- a/src/ConfigFile.cxx +++ b/src/ConfigFile.cxx @@ -20,6 +20,7 @@ #include "config.h" #include "conf.h" #include "ConfigTemplates.hxx" +#include "ConfigParser.hxx" extern "C" { #include "utils.h" @@ -48,60 +49,6 @@ extern "C" { static GSList *config_params[unsigned(CONF_MAX)]; -static bool -get_bool(const char *value, bool *value_r) -{ - static const char *t[] = { "yes", "true", "1", NULL }; - static const char *f[] = { "no", "false", "0", NULL }; - - if (string_array_contains(t, value)) { - *value_r = true; - return true; - } - - if (string_array_contains(f, value)) { - *value_r = false; - return true; - } - - return false; -} - -struct config_param * -config_new_param(const char *value, int line) -{ - struct config_param *ret = g_new(struct config_param, 1); - - if (!value) - ret->value = NULL; - else - ret->value = g_strdup(value); - - ret->line = line; - - ret->num_block_params = 0; - ret->block_params = NULL; - ret->used = false; - - return ret; -} - -void -config_param_free(struct config_param *param) -{ - g_free(param->value); - - for (unsigned i = 0; i < param->num_block_params; i++) { - g_free(param->block_params[i].name); - g_free(param->block_params[i].value); - } - - if (param->num_block_params) - g_free(param->block_params); - - g_free(param); -} - static void config_param_free_callback(gpointer data, G_GNUC_UNUSED gpointer user_data) { @@ -149,29 +96,6 @@ void config_global_check(void) g_slist_foreach(config_params[i], config_param_check, NULL); } -void -config_add_block_param(struct config_param * param, const char *name, - const char *value, int line) -{ - struct block_param *bp; - - assert(config_get_block_param(param, name) == NULL); - - param->num_block_params++; - - param->block_params = (struct block_param *) - g_realloc(param->block_params, - param->num_block_params * - sizeof(param->block_params[0])); - - bp = ¶m->block_params[param->num_block_params - 1]; - - bp->name = g_strdup(name); - bp->value = g_strdup(value); - bp->line = line; - bp->used = false; -} - static bool config_read_name_value(struct config_param *param, char *input, unsigned line, GError **error_r) @@ -485,23 +409,6 @@ config_get_positive(ConfigOption option, unsigned default_value) return (unsigned)value; } -const struct block_param * -config_get_block_param(const struct config_param * param, const char *name) -{ - if (param == NULL) - return NULL; - - for (unsigned i = 0; i < param->num_block_params; i++) { - if (0 == strcmp(name, param->block_params[i].name)) { - struct block_param *bp = ¶m->block_params[i]; - bp->used = true; - return bp; - } - } - - return NULL; -} - bool config_get_bool(ConfigOption option, bool default_value) { @@ -519,75 +426,3 @@ config_get_bool(ConfigOption option, bool default_value) return value; } - -const char * -config_get_block_string(const struct config_param *param, const char *name, - const char *default_value) -{ - const struct block_param *bp = config_get_block_param(param, name); - - if (bp == NULL) - return default_value; - - return bp->value; -} - -char * -config_dup_block_path(const struct config_param *param, const char *name, - GError **error_r) -{ - assert(error_r != NULL); - assert(*error_r == NULL); - - const struct block_param *bp = config_get_block_param(param, name); - if (bp == NULL) - return NULL; - - char *path = parsePath(bp->value, error_r); - if (G_UNLIKELY(path == NULL)) - g_prefix_error(error_r, - "Invalid path in \"%s\" at line %i: ", - name, bp->line); - - return path; -} - -unsigned -config_get_block_unsigned(const struct config_param *param, const char *name, - unsigned default_value) -{ - const struct block_param *bp = config_get_block_param(param, name); - long value; - char *endptr; - - if (bp == NULL) - return default_value; - - value = strtol(bp->value, &endptr, 0); - if (*endptr != 0) - MPD_ERROR("Not a valid number in line %i", bp->line); - - if (value < 0) - MPD_ERROR("Not a positive number in line %i", bp->line); - - return (unsigned)value; -} - -bool -config_get_block_bool(const struct config_param *param, const char *name, - bool default_value) -{ - const struct block_param *bp = config_get_block_param(param, name); - bool success, value; - - if (bp == NULL) - return default_value; - - success = get_bool(bp->value, &value); - if (!success) - MPD_ERROR("%s is not a boolean value (yes, true, 1) or " - "(no, false, 0) on line %i\n", - name, bp->line); - - return value; -} diff --git a/src/ConfigParser.cxx b/src/ConfigParser.cxx new file mode 100644 index 000000000..9798b6edd --- /dev/null +++ b/src/ConfigParser.cxx @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2003-2013 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "ConfigParser.hxx" + +extern "C" { +#include "string_util.h" +} + +bool +get_bool(const char *value, bool *value_r) +{ + static const char *t[] = { "yes", "true", "1", nullptr }; + static const char *f[] = { "no", "false", "0", nullptr }; + + if (string_array_contains(t, value)) { + *value_r = true; + return true; + } + + if (string_array_contains(f, value)) { + *value_r = false; + return true; + } + + return false; +} diff --git a/src/ConfigParser.hxx b/src/ConfigParser.hxx new file mode 100644 index 000000000..00fd42fe3 --- /dev/null +++ b/src/ConfigParser.hxx @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2003-2013 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_CONFIG_PARSER_HXX +#define MPD_CONFIG_PARSER_HXX + +bool +get_bool(const char *value, bool *value_r); + +#endif diff --git a/src/conf.h b/src/conf.h index 61c6cd9f7..b81b9ccdc 100644 --- a/src/conf.h +++ b/src/conf.h @@ -21,6 +21,7 @@ #define MPD_CONF_H #include "ConfigOption.hxx" +#include "ConfigData.hxx" #include "gcc.h" #include <stdbool.h> @@ -35,32 +36,6 @@ class Path; #endif -struct block_param { - char *name; - char *value; - int line; - - /** - * This flag is false when nobody has queried the value of - * this option yet. - */ - bool used; -}; - -struct config_param { - char *value; - unsigned int line; - - struct block_param *block_params; - unsigned num_block_params; - - /** - * This flag is false when nobody has queried the value of - * this option yet. - */ - bool used; -}; - /** * A GQuark for GError instances, resulting from malformed * configuration. @@ -136,55 +111,8 @@ unsigned config_get_positive(enum ConfigOption option, unsigned default_value); G_GNUC_PURE -const struct block_param * -config_get_block_param(const struct config_param *param, const char *name); - -G_GNUC_PURE bool config_get_bool(enum ConfigOption option, bool default_value); -G_GNUC_PURE -const char * -config_get_block_string(const struct config_param *param, const char *name, - const char *default_value); - -G_GNUC_MALLOC -static inline char * -config_dup_block_string(const struct config_param *param, const char *name, - const char *default_value) -{ - return g_strdup(config_get_block_string(param, name, default_value)); -} - -/** - * Same as config_dup_path(), but looks up the setting in the - * specified block. - */ -G_GNUC_MALLOC -char * -config_dup_block_path(const struct config_param *param, const char *name, - GError **error_r); - -G_GNUC_PURE -unsigned -config_get_block_unsigned(const struct config_param *param, const char *name, - unsigned default_value); - -G_GNUC_PURE -bool -config_get_block_bool(const struct config_param *param, const char *name, - bool default_value); - -G_GNUC_MALLOC -struct config_param * -config_new_param(const char *value, int line); - -void -config_param_free(struct config_param *param); - -void -config_add_block_param(struct config_param * param, const char *name, - const char *value, int line); - G_END_DECLS #endif |