Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions CoreFoundation/Preferences.subproj/CFXMLPreferencesDomain.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,18 +273,17 @@ static Boolean __CFWriteBytesToFileWithAtomicity(CFURLRef url, const void *bytes
close(fd);

if (atomic) {
// If the file was renamed successfully and we wrote it as root we need to reset the owner & group as they were.
if (writingFileAsRoot) {
chown(auxPath, owner, group);
}
// preserve the mode as passed in originally
chmod(auxPath, mode);

if (0 != rename(auxPath, cpath)) {
unlink(auxPath);
return false;
}

// If the file was renamed successfully and we wrote it as root we need to reset the owner & group as they were.
if (writingFileAsRoot) {
chown(cpath, owner, group);
}
}
return true;
}
Expand Down