prosody
5cf1c08805fb
core/configmanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

core/configmanager.lua @ 5814:5cf1c08805fb

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 03 Sep 2013 00:20:28 +0100
parent 5776:bd0ff8ae98a8
parent 5811:27ae988f5b70
child 6164:ef4024f6bc40
comparison
equal deleted inserted replaced
5809:be997c6a69be 5814:5cf1c08805fb
75 path = path:gsub("^%.%"..path_sep.."+", ""); 75 path = path:gsub("^%.%"..path_sep.."+", "");
76 76
77 local is_relative; 77 local is_relative;
78 if path_sep == "/" and path:sub(1,1) ~= "/" then 78 if path_sep == "/" and path:sub(1,1) ~= "/" then
79 is_relative = true; 79 is_relative = true;
80 elseif path_sep == "\\" and (path:sub(1,1) ~= "/" and (path:sub(2,3) ~= ":\\" or path:sub(2,3) ~= ":/")) then 80 elseif path_sep == "\\" and (path:sub(1,1) ~= "/" and (path:sub(2,3) ~= ":\\" and path:sub(2,3) ~= ":/")) then
81 is_relative = true; 81 is_relative = true;
82 end 82 end
83 if is_relative then 83 if is_relative then
84 return parent_path..path_sep..path; 84 return parent_path..path_sep..path;
85 end 85 end