diff options
author | wm4 <wm4@nowhere> | 2015-02-15 14:28:49 +0100 |
---|---|---|
committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-02-16 18:16:28 +0900 |
commit | 21a95f5ed98204c2b4cb5ca00ea8498f0db07a9e (patch) | |
tree | e4bdb1ae8c196a5b916ccb277ad0784af2ca3069 /options/path.c | |
parent | 6dc2a23cda5d6b06918d2f6ddd6ba600d5ee79a2 (diff) | |
download | mpv-21a95f5ed98204c2b4cb5ca00ea8498f0db07a9e.tar.bz2 mpv-21a95f5ed98204c2b4cb5ca00ea8498f0db07a9e.tar.xz |
player: undeprecate 'config' files
Actually, it's pretty simple to look for multiple filenames at once,
since mp_find_all_config_files() is already a bit "special" anyway.
See #1569. Reverts most of commit db167cd4 (keeps osx-bundle.conf).
(cherry picked from commit a27aa68dd33c613218d261b14ef1cf763abc1c33)
Diffstat (limited to 'options/path.c')
-rw-r--r-- | options/path.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/options/path.c b/options/path.c index 5783e2e549..6ae0fc4d11 100644 --- a/options/path.c +++ b/options/path.c @@ -147,12 +147,15 @@ char **mp_find_all_config_files(void *talloc_ctx, struct mpv_global *global, char **dirs = mp_config_dirs(NULL, global); for (int i = 0; dirs && dirs[i]; i++) { - char *file = talloc_asprintf(ret, "%s/%s", dirs[i], filename); - - if (!mp_path_exists(file) || num_ret >= MAX_CONFIG_PATHS) - continue; - - ret[num_ret++] = file; + bstr s = bstr0(filename); + while (s.len) { + bstr fn; + bstr_split_tok(s, "|", &fn, &s); + + char *file = talloc_asprintf(ret, "%s/%.*s", dirs[i], BSTR_P(fn)); + if (mp_path_exists(file) && num_ret < MAX_CONFIG_PATHS) + ret[num_ret++] = file; + } } talloc_free(dirs); |