X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=65fb16321e906aea4b95903fd6ac8b234d2e8328;hb=53be063a01cfd442e5aab98ba79ddd8a87ea5ea9;hp=88620b38fc8efa7ae7ff1e79c600de44957b38f9;hpb=88dfdec11aab971fdc9b6d631eebbd118d30b574;p=prosody.git

diff --git a/prosody b/prosody
index 88620b38..65fb1632 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(parent_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 parent_path..path_sep..path;
+			end
+		end
+		return path;
+	end
+	
 	prosody.arg = _G.arg;
 
 	prosody.platform = "unknown";
@@ -285,6 +302,7 @@ end
 function load_secondary_libraries()
 	--- Load and initialise core modules
 	require "util.import"
+	require "util.xmppstream"
 	require "core.xmlhandlers"
 	require "core.rostermanager"
 	require "core.hostmanager"
@@ -325,10 +343,11 @@ function init_data_store()
 		end
 		return username, host, datastore, data;
 	end);
+	require "core.storagemanager";
 end
 
 function prepare_to_start()
-	log("debug", "Prosody is using the %s backend for connection handling", server.get_backend());
+	log("info", "Prosody is using the %s backend for connection handling", server.get_backend());
 	-- Signal to modules that we are ready to start
 	prosody.events.fire_event("server-starting");