diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-06 20:39:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-06 20:39:53 -0500 |
| commit | 7477703586af3710584888b197d84a0938a27fe9 (patch) | |
| tree | a2b17e49945fcdb5879e79a5d46bd27e326659ca /src/nvim/undo.c | |
| parent | 5855a3ea7bf19fdf8d1c0351ce062386fb98127a (diff) | |
| parent | 8ae34ab7802763c2bbf64c8ba99c36d159da7220 (diff) | |
| download | rneovim-7477703586af3710584888b197d84a0938a27fe9.tar.gz rneovim-7477703586af3710584888b197d84a0938a27fe9.tar.bz2 rneovim-7477703586af3710584888b197d84a0938a27fe9.zip | |
Merge pull request #13468 from janlazo/vim-8.1.0818
vim-patch:8.1.{818,1131,2064},8.2.{587,879,1021,1296,2104}
Diffstat (limited to 'src/nvim/undo.c')
| -rw-r--r-- | src/nvim/undo.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/undo.c b/src/nvim/undo.c index a8b8f7aa50..636d00bbbf 100644 --- a/src/nvim/undo.c +++ b/src/nvim/undo.c @@ -1255,7 +1255,8 @@ theend: /// a bit more verbose. /// Otherwise use curbuf->b_ffname to generate the undo file name. /// "hash[UNDO_HASH_SIZE]" must be the hash value of the buffer text. -void u_read_undo(char *name, char_u *hash, char_u *orig_name) +void u_read_undo(char *name, const char_u *hash, + const char_u *orig_name FUNC_ATTR_UNUSED) FUNC_ATTR_NONNULL_ARG(2) { u_header_T **uhp_table = NULL; @@ -1273,7 +1274,7 @@ void u_read_undo(char *name, char_u *hash, char_u *orig_name) // owner of the text file or equal to the current user. FileInfo file_info_orig; FileInfo file_info_undo; - if (os_fileinfo((char *)orig_name, &file_info_orig) + if (os_fileinfo((const char *)orig_name, &file_info_orig) && os_fileinfo((char *)file_name, &file_info_undo) && file_info_orig.stat.st_uid != file_info_undo.stat.st_uid && file_info_undo.stat.st_uid != getuid()) { |