util.datamanager: Import tostring and type (fix global access)

[prosody.git] / util / datamanager.lua

diff --git a/util/datamanager.lua b/util/datamanager.lua
index 3016feed8beb224ba79bfbc666615ec72a825393..fb9ba3a4ce6283f6eb33abce53a218f692cc96c6 100644 (file)
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -17,7 +17,9 @@ local io_open = io.open;
 local os_remove = os.remove;
 local os_rename = os.rename;
 local tonumber = tonumber;
+local tostring = tostring;
 local next = next;
+local type = type;
 local t_insert = table.insert;
 local t_concat = table.concat;
 local envloadfile = require"util.envload".envloadfile;
@@ -144,23 +146,26 @@ end
 local function atomic_store(filename, data)
        local scratch = filename.."~";
        local f, ok, msg;
-       repeat
-               f, msg = io_open(scratch, "w");
-               if not f then break end
 
-               ok, msg = f:write(data);
-               if not ok then break end
+       f, msg = io_open(scratch, "w");
+       if not f then
+               return nil, msg;
+       end
 
-               ok, msg = f:close();
-               if not ok then break end
+       ok, msg = f:write(data);
+       if not ok then
+               f:close();
+               os_remove(scratch);
+               return nil, msg;
+       end
 
-               return os_rename(scratch, filename);
-       until false;
+       ok, msg = f:close();
+       if not ok then
+               os_remove(scratch);
+               return nil, msg;
+       end
 
-       -- Cleanup
-       if f then f:close(); end
-       os_remove(scratch);
-       return nil, msg;
+       return os_rename(scratch, filename);
 end
 
 if prosody and prosody.platform ~= "posix" then
@@ -209,17 +214,21 @@ local function store(username, host, datastore, data)
        return true;
 end
 
+-- Append a blob of data to a file
 local function append(username, host, datastore, ext, data)
+       if type(data) ~= "string" then return; end
        local filename = getpath(username, host, datastore, ext, true);
 
        local ok;
        local f, msg = io_open(filename, "r+");
        if not f then
+               -- File did probably not exist, let's create it
                f, msg = io_open(filename, "w");
                if not f then
-                       return nil, msg;
+                       return nil, msg, "open";
                end
        end
+
        local pos = f:seek("end");
        ok, msg = fallocate(f, pos, #data);
        if not ok then
@@ -232,10 +241,10 @@ local function append(username, host, datastore, ext, data)
                f:seek("set", pos);
        end
 
-       if ok then
-               f:write(data);
-       else
-               return ok, msg;
+       ok, msg = f:write(data);
+       if not ok then
+               f:close();
+               return ok, msg, "write";
        end
 
        ok, msg = f:close();
@@ -243,7 +252,7 @@ local function append(username, host, datastore, ext, data)
                return ok, msg;
        end
 
-       return true;
+       return true, pos;
 end
 
 local function list_append(username, host, datastore, data)
@@ -398,6 +407,7 @@ return {
        getpath = getpath;
        load = load;
        store = store;
+       append_raw = append;
        list_append = list_append;
        list_store = list_store;
        list_load = list_load;