util.xmppstream: new() now returns a parser object

[prosody.git] / util / datamanager.lua

diff --git a/util/datamanager.lua b/util/datamanager.lua
index 4d07d6ccfdcdbd9d5246f0beb0402f32467554ed..a2da0aa344c50859001904beb43ce58f284e8ad1 100644 (file)
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -15,19 +15,25 @@ local loadfile, setfenv, pcall = loadfile, setfenv, pcall;
 local log = require "util.logger".init("datamanager");
 local io_open = io.open;
 local os_remove = os.remove;
-local io_popen = io.popen;
 local tostring, tonumber = tostring, tonumber;
 local error = error;
 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 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
-               local x = io_popen("mkdir \""..path.."\" 2>&1"):read("*a");
+               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