X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fdatamanager.lua;h=01c7aab2210f85f817f7e6c63620d5d37cab7937;hb=332edec7b662736cd8acac68ebdeeae6dc7a53c2;hp=bfd69ebfcb02dbf3a5bb4eebe8b63950542b3d58;hpb=b0f948eaa5c166121d8b5754c708a38f624b415d;p=prosody.git

diff --git a/util/datamanager.lua b/util/datamanager.lua
index bfd69ebf..01c7aab2 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -21,13 +21,19 @@ local next = next;
 local t_insert = table.insert;
 local append = require "util.serialization".append;
 local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end
-local lfs_mkdir = require "lfs".mkdir;
+local raw_mkdir;
+
+if prosody.platform == "posix" then
+	raw_mkdir = require "util.pposix".mkdir; -- Doesn't trample on umask
+else
+	raw_mkdir = require "lfs".mkdir;
+end
 
 module "datamanager"
 
 ---- utils -----
 local encode, decode;
-do 
+do
 	local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber("0x"..k)); return t[k]; end });
 
 	decode = function (s)
@@ -43,7 +49,7 @@ local _mkdir = {};
 local function mkdir(path)
 	path = path:gsub("/", path_separator); -- TODO as an optimization, do this during path creation rather than here
 	if not _mkdir[path] then
-		lfs_mkdir(path);
+		raw_mkdir(path);
 		_mkdir[path] = true;
 	end
 	return path;
@@ -88,7 +94,7 @@ end
 
 function getpath(username, host, datastore, ext, create)
 	ext = ext or "dat";
-	host = host and encode(host);
+	host = (host and encode(host)) or "_global";
 	username = username and encode(username);
 	if username then
 		if create then mkdir(mkdir(mkdir(data_path).."/"..host).."/"..datastore); end