diff options
| author | Michael Reed <m.reed@mykolab.com> | 2016-01-14 16:05:23 -0500 |
|---|---|---|
| committer | Michael Reed <m.reed@mykolab.com> | 2016-01-14 23:38:26 -0500 |
| commit | 07265d221fbd3b4fd16440caab49c70d14370079 (patch) | |
| tree | 07118b6756dfe5c34204112c228bb72b7f83aa11 /src/nvim/shada.c | |
| parent | 24fbb2c866039d61107fa1f6a2efe86bb6951e55 (diff) | |
| download | rneovim-07265d221fbd3b4fd16440caab49c70d14370079.tar.gz rneovim-07265d221fbd3b4fd16440caab49c70d14370079.tar.bz2 rneovim-07265d221fbd3b4fd16440caab49c70d14370079.zip | |
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 <stdio.h> and <fcntl.h>, 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.
Diffstat (limited to 'src/nvim/shada.c')
| -rw-r--r-- | src/nvim/shada.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |