aboutsummaryrefslogtreecommitdiffstats
path: root/util/datamanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-11-23 20:21:20 +0000
committerMatthew Wild <mwild1@gmail.com>2009-11-23 20:21:20 +0000
commit12c4c331afbdfd1f68734e50d58c8ece978d9b9c (patch)
treecf9f18e7d4d93002ed3b2d2fdb274537b6412b96 /util/datamanager.lua
parent53979a7de7baea48ede8b2a45a58127ac645d86b (diff)
parent49916630b91195f385ab4c76ee089e29da5e21a8 (diff)
downloadprosody-12c4c331afbdfd1f68734e50d58c8ece978d9b9c.tar.gz
prosody-12c4c331afbdfd1f68734e50d58c8ece978d9b9c.zip
Merge with 0.6
Diffstat (limited to 'util/datamanager.lua')
-rw-r--r--util/datamanager.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/datamanager.lua b/util/datamanager.lua
index 4d07d6cc..bfd69ebf 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -15,13 +15,13 @@ 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 lfs_mkdir = require "lfs".mkdir;
module "datamanager"
@@ -43,7 +43,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");
+ lfs_mkdir(path);
_mkdir[path] = true;
end
return path;