From ef23c30ee4e306a7893eece595fd8ac0d8432f9e Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Tue, 5 Sep 2017 17:01:34 +0200 Subject: [PATCH] e2lib: make use of errcode in mkdir() Signed-off-by: Tobias Ulmer --- generic/e2lib.lua | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/generic/e2lib.lua b/generic/e2lib.lua index 8f4db94..f567557 100644 --- a/generic/e2lib.lua +++ b/generic/e2lib.lua @@ -2189,8 +2189,9 @@ function e2lib.mkdir(dir, mode) local rc, errstring, errnum = le2lib.mkdir(dir, mode) if not rc then - return false, err.new("cannot create directory %q: %s", dir, - errstring), errnum + return false, err.ecset( + err.new("cannot create directory %q: %s", dir, errstring), + errno.errnum2def(errnum)) end return true @@ -2213,16 +2214,12 @@ function e2lib.mkdir_recursive(path, mode) end end - eexist = errno.def2errnum("EEXIST") - trace.filter_function("e2lib", "mkdir") for _,dir in ipairs(dirs) do rc, re, errnum = e2lib.mkdir(dir, mode) - if not rc then - if errnum ~= eexist then - trace.filter_function_remove("e2lib", "mkdir") - return false, re - end + if not rc and not err.eccmp(re, "EEXIST") then + trace.filter_function_remove("e2lib", "mkdir") + return false, re end end trace.filter_function_remove("e2lib", "mkdir") -- 2.39.5