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

FileID: remove last use of st_ino in memline.c

Browse Source 
* FileID can’t be used in memline.c, because the block0 is defined to
use only a 32bit ino.
* implemented `os_file_info_get_inode`
* deprecated `os_file_info_get_inode
This commit is contained in:
Stefan Hoffmann 2014-05-28 14:42:27 +02:00
parent a0394f5e77
commit cc02c3537d
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/memline.c
View File

@ -687,7 +687,7 @@ static void set_b0_fname(ZERO_BL *b0p, buf_T *buf)
if (os_get_file_info((char *)buf->b_ffname, &file_info)) {
long_to_char((long)file_info.stat.st_mtim.tv_sec, b0p->b0_mtime);
#ifdef CHECK_INODE
long_to_char((long)file_info.stat.st_ino, b0p->b0_ino);
long_to_char((long)os_file_info_get_inode(&file_info), b0p->b0_ino);
#endif
buf_store_file_info(buf, &file_info);
buf->b_mtime_read = buf->b_mtime;
@ -3549,20 +3549,19 @@ static int b0_magic_wrong(ZERO_BL *b0p)
* available -> probably same file
* == 0 == 0 FAIL FAIL FALSE
*
* Note that when the ino_t is 64 bits, only the last 32 will be used. This
* can't be changed without making the block 0 incompatible with 32 bit
* versions.
* Only the last 32 bits of the inode will be used. This can't be changed
* without making the block 0 incompatible with 32 bit versions.
*/
static int
static int
fnamecmp_ino (
char_u *fname_c, /* current file name */
char_u *fname_s, /* file name from swap file */
long ino_block0
)
{
ino_t ino_c = 0; /* ino of current file */
ino_t ino_s; /* ino of file from swap file */
uint64_t ino_c = 0; /* ino of current file */
uint64_t ino_s; /* ino of file from swap file */
char_u buf_c[MAXPATHL]; /* full path of fname_c */
char_u buf_s[MAXPATHL]; /* full path of fname_s */
int retval_c; /* flag: buf_c valid */
@ -3570,7 +3569,7 @@ fnamecmp_ino (
FileInfo file_info;
if (os_get_file_info((char *)fname_c, &file_info)) {
ino_c = (ino_t)file_info.stat.st_ino;
ino_c = os_file_info_get_inode(&file_info);
}
/*
@ -3579,9 +3578,9 @@ fnamecmp_ino (
* valid on this machine), use the inode from block 0.
*/
if (os_get_file_info((char *)fname_s, &file_info)) {
ino_s = (ino_t)file_info.stat.st_ino;
ino_s = os_file_info_get_inode(&file_info);
} else {
ino_s = (ino_t)ino_block0;
ino_s = (uint64_t)ino_block0;
}
if (ino_c && ino_s)