Combined OverrideImmutable[Commit|Abort] functions

Ticket: ENT-10961, CFE-1840
Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>

Author: larsewi

libpromises/override_fsattrs.c

@@ -17,6 +17,7 @@ bool OverrideImmutableBegin(
         {
             Log(LOG_LEVEL_ERR,
                 "Failed to copy filename '%s': Filename too long (%zu >= %zu)",
+                orig,
                 ret,
                 copy_len);
             return false;
@@ -53,13 +54,19 @@ bool OverrideImmutableBegin(
     return true;
 }
 
-bool OverrideImmutableCommit(const char *orig, const char *copy, bool override)
+bool OverrideImmutableCommit(
+    const char *orig, const char *copy, bool override, bool abort)
 {
     if (!override)
     {
         return true;
     }
 
+    if (abort)
+    {
+        return unlink(copy) == 0;
+    }
+
     struct stat sb;
     if (lstat(orig, &sb) == -1)
     {
@@ -152,14 +159,3 @@ bool OverrideImmutableCommit(const char *orig, const char *copy, bool override)
 
     return true;
 }
-
-bool OverrideImmutableAbort(
-    ARG_UNUSED const char *orig, const char *copy, bool override)
-{
-    assert(copy != NULL);
-    if (!override)
-    {
-        return true;
-    }
-    return unlink(copy) == 0;
-}

libpromises/override_fsattrs.h

@@ -46,19 +46,11 @@ bool OverrideImmutableBegin(
  * @param orig The original file (may be immutable)
  * @param copy The mutated copy to replace the original
  * @param override Whether to actually do override
+ * @param abort Whether to abort the override
  * @return false in case of failure
  * @note The immutable bit is reset to it's original state
  */
 bool OverrideImmutableCommit(
-    const char *orig, const char *copy, bool override);
-
-/**
- * @brief Simply unlinks the mutable copy
- * @param orig Not used (reserved in for future use)
- * @param copy The mutated copy to unlink
- * @param override NOOP if override is false
- * @return false in case of failure (but you probably don't care)
- */
-bool OverrideImmutableAbort(const char *orig, const char *copy, bool override);
+    const char *orig, const char *copy, bool override, bool abort);
 
 #endif /* CFENGINE_OVERRIDE_FSATTRS_H */