From fab9febdc3a863c157a56cc4de2418cbb9665844 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 9 Dec 2012 15:05:21 +0100 Subject: path: add mp_find_config_file and reorganize some of the code Add `mp_find_config_file` to search different known paths and use that in ass_mp to look for the fontconfig configuration file. Some incidental changes spawned by this feature where: * Buffer allocation for the strings containing the paths is now performed with talloc. All of the allocations are done on a NULL context, but it still improves readability of the code. * Move the OSX function for lookup inside of a bundle: this code path was currently not used by the bundle generated with `make osxbundle`. The plan is to use it again in a future commit to get a fontconfig config file. --- core/input/input.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'core/input/input.c') diff --git a/core/input/input.c b/core/input/input.c index 6d60211e65..1ee1ff909a 100644 --- a/core/input/input.c +++ b/core/input/input.c @@ -1794,7 +1794,8 @@ struct input_ctx *mp_input_init(struct input_conf *input_conf) char *file; char *config_file = input_conf->config_file; - file = config_file[0] != '/' ? get_path(config_file) : config_file; + file = config_file[0] != '/' ? + mp_find_user_config_file(config_file) : config_file; if (!file) return ictx; @@ -1802,7 +1803,7 @@ struct input_ctx *mp_input_init(struct input_conf *input_conf) // free file if it was allocated by get_path(), // before it gets overwritten if (file != config_file) - free(file); + talloc_free(file); // Try global conf dir file = MPLAYER_CONFDIR "/input.conf"; if (!parse_config_file(ictx, file)) @@ -1811,7 +1812,7 @@ struct input_ctx *mp_input_init(struct input_conf *input_conf) } else { // free file if it was allocated by get_path() if (file != config_file) - free(file); + talloc_free(file); } #ifdef CONFIG_JOYSTICK -- cgit v1.2.3