X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=6ec9131e5a27aa49b196326ecb6e7db986d2d245;hb=3aa1c58add6177470f4b6eb35d56beb2e9ba527e;hp=fd6a051c420fb5ef5936592fb44e4394961430c1;hpb=fc67a891781b47c31eda0c38f70fbd6908e77d26;p=prosody.git diff --git a/prosody b/prosody index fd6a051c..6ec9131e 100755 --- a/prosody +++ b/prosody @@ -163,6 +163,23 @@ function init_global_state() prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR, plugins = CFG_PLUGINDIR, data = CFG_DATADIR }; + local path_sep = package.config:sub(1,1); + local rel_path_start = ".."..path_sep; + function prosody.resolve_relative_path(path) + if path then + local is_relative; + if path_sep == "/" and path:sub(1,1) ~= "/" then + is_relative = true; + elseif path_sep == "\\" and (path:sub(1,1) ~= "/" and path:sub(2,3) ~= ":\\") then + is_relative = true; + end + if is_relative then + return CFG_CONFIGDIR..path_sep..path; + end + end + return path; + end + prosody.arg = _G.arg; prosody.platform = "unknown";