Merge from waqas

diff --git a/prosody b/prosody
index 58ebc16a09afb83876e10d030ae046ccdb47bbf7..10aea492d891123ae0c5321ba7111569d2bf9ffb 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -56,7 +56,30 @@ do
        end
 end
 
-require "util.datamanager".set_data_path(config.get("*", "core", "data_path") or "data");
+local data_path = config.get("*", "core", "data_path") or "data";
+local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end
+local _mkdir = {}
+function mkdir(path)
+       path = path:gsub("/", path_separator);
+       --print("mkdir",path);
+       local x = io.popen("mkdir "..path.." 2>&1"):read("*a");
+end
+function encode(s) return s and (s:gsub("%W", function (c) return string.format("%%%x", c:byte()); end)); end
+function mkdirs(host)
+       if not _mkdir[host] then
+               local host_dir = string.format("%s/%s", data_path, encode(host));
+               mkdir(host_dir);
+               mkdir(host_dir.."/accounts");
+               mkdir(host_dir.."/vcard");
+               mkdir(host_dir.."/roster");
+               mkdir(host_dir.."/private");
+               mkdir(host_dir.."/offline");
+               _mkdir[host] = true;
+       end
+end
+mkdir(data_path);
+
+require "util.datamanager".set_data_path(data_path);
 
 local server = require "net.server"
 
@@ -71,6 +94,7 @@ local defined_hosts = config.getconfig();
 for host, host_config in pairs(defined_hosts) do
        if host ~= "*" and (host_config.core.enabled == nil or host_config.core.enabled) then
                hosts[host] = {type = "local", connected = true, sessions = {}, host = host, s2sout = {} };
+               mkdirs(data_path.."/"..host);
        end
 end