IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor(backup): remove duplicate os_copy_xattr() (#28020)

Browse Source 
The first os_copy_xattr() is inside #ifdef UNIX, while the second isn't,
so the first one isn't actually needed.
This commit is contained in:
zeertzjq 2024-03-25 14:39:00 +08:00 committed by GitHub
parent 02d00cf3ee
commit 7dd6fd422b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/bufwrite.c
View File

@ -913,24 +913,18 @@ static int buf_write_make_backup(char *fname, bool append, FileInfo *file_info_o
os_setperm(*backupp, perm & 0777); os_setperm(*backupp, perm & 0777);
#ifdef UNIX #ifdef UNIX
//
// Try to set the group of the backup same as the original file. If // Try to set the group of the backup same as the original file. If
// this fails, set the protection bits for the group same as the // this fails, set the protection bits for the group same as the
// protection bits for others. // protection bits for others.
//
if (file_info_new.stat.st_gid != file_info_old->stat.st_gid if (file_info_new.stat.st_gid != file_info_old->stat.st_gid
&& os_chown(*backupp, (uv_uid_t)-1, (uv_gid_t)file_info_old->stat.st_gid) != 0) { && os_chown(*backupp, (uv_uid_t)-1, (uv_gid_t)file_info_old->stat.st_gid) != 0) {
os_setperm(*backupp, (perm & 0707) | ((perm & 07) << 3)); os_setperm(*backupp, (perm & 0707) | ((perm & 07) << 3));
} }
# ifdef HAVE_XATTR
os_copy_xattr(fname, *backupp);
# endif
os_file_settime(*backupp, os_file_settime(*backupp,
(double)file_info_old->stat.st_atim.tv_sec, (double)file_info_old->stat.st_atim.tv_sec,
(double)file_info_old->stat.st_mtim.tv_sec); (double)file_info_old->stat.st_mtim.tv_sec);
#endif #endif
os_set_acl(*backupp, acl); os_set_acl(*backupp, acl);
#ifdef HAVE_XATTR #ifdef HAVE_XATTR
os_copy_xattr(fname, *backupp); os_copy_xattr(fname, *backupp);