diff options
author | Marck | 2010-08-10 16:07:21 +0200 |
---|---|---|
committer | Diva Canto | 2010-08-15 17:14:26 -0700 |
commit | 21bc238029aed6d80f0f3bf4233f7d68387e9a88 (patch) | |
tree | 04c3cbe25beedf3546563ee6201893a1647f947c /OpenSim/Region/Application/ConfigurationLoader.cs | |
parent | Fix a parenthesis in prior commit (diff) | |
download | opensim-SC_OLD-21bc238029aed6d80f0f3bf4233f7d68387e9a88.zip opensim-SC_OLD-21bc238029aed6d80f0f3bf4233f7d68387e9a88.tar.gz opensim-SC_OLD-21bc238029aed6d80f0f3bf4233f7d68387e9a88.tar.bz2 opensim-SC_OLD-21bc238029aed6d80f0f3bf4233f7d68387e9a88.tar.xz |
Configuration files can read include files from relative paths.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 09f7bea..e69e3fc 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
@@ -211,7 +211,17 @@ namespace OpenSim | |||
211 | else | 211 | else |
212 | { | 212 | { |
213 | string basepath = Path.GetFullPath(Util.configDir()); | 213 | string basepath = Path.GetFullPath(Util.configDir()); |
214 | string path = Path.Combine(basepath, file); | 214 | // Resolve relative paths with wildcards |
215 | string chunkWithoutWildcards = file; | ||
216 | string chunkWithWildcards = string.Empty; | ||
217 | int wildcardIndex = file.IndexOfAny(new char[] { '*', '?' }); | ||
218 | if (wildcardIndex != -1) | ||
219 | { | ||
220 | chunkWithoutWildcards = file.Substring(0, wildcardIndex); | ||
221 | chunkWithWildcards = file.Substring(wildcardIndex); | ||
222 | } | ||
223 | string path = Path.Combine(basepath, chunkWithoutWildcards); | ||
224 | path = Path.GetFullPath(path) + chunkWithWildcards; | ||
215 | string[] paths = Util.Glob(path); | 225 | string[] paths = Util.Glob(path); |
216 | foreach (string p in paths) | 226 | foreach (string p in paths) |
217 | { | 227 | { |