From afe389d87040e0f37012e4bebe3340013e5ed5a7 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 27 Feb 2016 15:29:56 +0100 Subject: util.datamanager: Explicit handling of each error condition (see #632) --- util/datamanager.lua | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'util/datamanager.lua') diff --git a/util/datamanager.lua b/util/datamanager.lua index 07b2fe4a..dc98bd13 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -144,24 +144,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(); - f = nil; -- no longer valid - 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 -- cgit v1.2.3