From 07265d221fbd3b4fd16440caab49c70d14370079 Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Thu, 14 Jan 2016 16:05:23 -0500 Subject: Misc. macro cleanup - ROOT_UID's comment is misleading, as it's always defined to 0. - SEEK_{SET,END} & O_NOFOLLOW should already be defined on Unix-like systems in and , respectively. In any case, neither of those #ifdef blocks should be in the middle of source files. - The S_IS{LNK,DIR,...} macros should only be undefined on Windows. --- src/nvim/shada.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim/shada.c') diff --git a/src/nvim/shada.c b/src/nvim/shada.c index 59ef2a0d28..f7d71f458d 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -3082,8 +3082,8 @@ shada_write_file_nomerge: {} // viminfo file that the user can't read. FileInfo old_info; if (os_fileinfo((char *)fname, &old_info)) { - if (getuid() == ROOT_UID) { - if (old_info.stat.st_uid != ROOT_UID + if (getuid() == 0) { + if (old_info.stat.st_uid != 0 || old_info.stat.st_gid != getgid()) { const uv_uid_t old_uid = (uv_uid_t) old_info.stat.st_uid; const uv_gid_t old_gid = (uv_gid_t) old_info.stat.st_gid; -- cgit