aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/datamanager.lua16
-rw-r--r--util/sasl.lua2
2 files changed, 11 insertions, 7 deletions
diff --git a/util/datamanager.lua b/util/datamanager.lua
index 80b35733..99eef9f3 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -3,7 +3,7 @@ local setmetatable, type = setmetatable, type;
local pairs, ipairs = pairs, ipairs;
local char = string.char;
local loadfile, setfenv, pcall = loadfile, setfenv, pcall;
-local log = log;
+local log = require "util.logger".init("datamanager");
local io_open = io.open;
local os_remove = os.remove;
local tostring, tonumber = tostring, tonumber;
@@ -17,14 +17,14 @@ local indent = function(f, i)
end
end
+local data_path = "data";
+
module "datamanager"
---- utils -----
local encode, decode;
-local log = function (type, msg) return log(type, "datamanager", msg); end
-
do
local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber("0x"..k)); return t[k]; end });
@@ -70,14 +70,18 @@ end
------- API -------------
+function set_data_path(path)
+ data_path = path;
+end
+
function getpath(username, host, datastore, ext)
ext = ext or "dat";
if username then
- return format("data/%s/%s/%s.%s", encode(host), datastore, encode(username), ext);
+ return format("%s/%s/%s/%s.%s", data_path, encode(host), datastore, encode(username), ext);
elseif host then
- return format("data/%s/%s.%s", encode(host), datastore, ext);
+ return format("%s/%s/%s.%s", data_path, encode(host), datastore, ext);
else
- return format("data/%s.%s", datastore, ext);
+ return format("%s/%s.%s", data_path, datastore, ext);
end
end
diff --git a/util/sasl.lua b/util/sasl.lua
index f10fb934..f5ef04b8 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -67,7 +67,7 @@ local function new_digest_md5(realm, password_handler)
local function parse(data)
message = {}
- for k, v in gmatch(data, [[([%w%-]+)="?([%w%-%/%.%+=]+)"?,?]]) do
+ for k, v in gmatch(data, [[([%w%-]+)="?([^",]*)"?,?]]) do -- FIXME The hacky regex makes me shudder
message[k] = v
end
return message