diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/option.c | 7 | ||||
| -rw-r--r-- | src/nvim/shada.c | 4 | ||||
| -rw-r--r-- | src/nvim/vim.h | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index e3df559c49..2ac1abeeba 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -837,10 +837,9 @@ set_option_default ( } else { /* P_BOOL */ *(int *)varp = (int)(intptr_t)options[opt_idx].def_val[dvi]; #ifdef UNIX - // 'modeline' defaults to off for root - if (options[opt_idx].indir == PV_ML && getuid() == 0) { - *(int *)varp = false; - } + /* 'modeline' defaults to off for root */ + if (options[opt_idx].indir == PV_ML && getuid() == ROOT_UID) + *(int *)varp = FALSE; #endif /* May also set global value for local option. */ if (both) diff --git a/src/nvim/shada.c b/src/nvim/shada.c index f7d71f458d..59ef2a0d28 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() == 0) { - if (old_info.stat.st_uid != 0 + if (getuid() == ROOT_UID) { + if (old_info.stat.st_uid != ROOT_UID || 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; diff --git a/src/nvim/vim.h b/src/nvim/vim.h index 98ef5eb4fd..71d7556880 100644 --- a/src/nvim/vim.h +++ b/src/nvim/vim.h @@ -37,7 +37,9 @@ Error: configure did not run properly.Check auto/config.log. #define NUMBUFLEN 30 /* length of a buffer to store a number in ASCII */ -# define MAX_TYPENR 65535 +#define MAX_TYPENR 65535 + +#define ROOT_UID 0 #include "nvim/keymap.h" #include "nvim/macros.h" |