mkdir: reset mtime *after* fchown()

Follow-up for 34c3d57474 Also, drop pointless shortcut.
2026-01-21 08:35:31 +09:00
parent d0badc0a61
commit dbd7555190
1 changed files with 2 additions and 5 deletions
@@ -255,8 +255,8 @@ int mkdir_p_root_full(const char *root, const char *p, uid_t uid, gid_t gid, mod
        if (nfd < 0)
                return nfd;

-        if (ts == USEC_INFINITY && !uid_is_valid(uid) && !gid_is_valid(gid))
-                return 1;
+        if ((uid_is_valid(uid) || gid_is_valid(gid)) && fchown(nfd, uid, gid) < 0)
+                return -errno;

        if (ts != USEC_INFINITY) {
                struct timespec tspec;
@@ -269,8 +269,5 @@ int mkdir_p_root_full(const char *root, const char *p, uid_t uid, gid_t gid, mod
                        return -errno;
        }

-        if ((uid_is_valid(uid) || gid_is_valid(gid)) && fchown(nfd, uid, gid) < 0)
-                return -errno;
-
        return 1;
 }