diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-09-04 01:22:25 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-09-04 01:22:25 -0400 |
| commit | d66cd61b79d6d592436c4552dbdddb904dd1c22e (patch) | |
| tree | 85e4651f4d56f6dc5b61df65eff9da9dd83ecce2 /src/nvim/memfile.c | |
| parent | 3051015f8907445bbb193a0781c75f9cdc54236e (diff) | |
| parent | 7ac191ab1085875319e139b044ec1f98498b87ce (diff) | |
| download | rneovim-d66cd61b79d6d592436c4552dbdddb904dd1c22e.tar.gz rneovim-d66cd61b79d6d592436c4552dbdddb904dd1c22e.tar.bz2 rneovim-d66cd61b79d6d592436c4552dbdddb904dd1c22e.zip | |
Merge pull request #1054 from stefan991/fileinfo-getter
FileInfo getters for `filesize`, `hardlinks` and `blocksize`
Diffstat (limited to 'src/nvim/memfile.c')
| -rw-r--r-- | src/nvim/memfile.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/memfile.c b/src/nvim/memfile.c index 82369b739a..827cff2299 100644 --- a/src/nvim/memfile.c +++ b/src/nvim/memfile.c @@ -122,11 +122,11 @@ memfile_T *mf_open(char_u *fname, int flags) * mf_blocknr_max must be rounded up. */ FileInfo file_info; - if (mfp->mf_fd >= 0 - && os_get_file_info_fd(mfp->mf_fd, &file_info) - && file_info.stat.st_blksize >= MIN_SWAP_PAGE_SIZE - && file_info.stat.st_blksize <= MAX_SWAP_PAGE_SIZE) { - mfp->mf_page_size = file_info.stat.st_blksize; + if (mfp->mf_fd >= 0 && os_fileinfo_fd(mfp->mf_fd, &file_info)) { + uint64_t blocksize = os_fileinfo_blocksize(&file_info); + if (blocksize >= MIN_SWAP_PAGE_SIZE && blocksize <= MAX_SWAP_PAGE_SIZE) { + mfp->mf_page_size = blocksize; + } } if (mfp->mf_fd < 0 || (flags & (O_TRUNC|O_EXCL)) @@ -1017,7 +1017,7 @@ mf_do_open ( */ FileInfo file_info; if ((flags & O_CREAT) - && os_get_file_info_link((char *)mfp->mf_fname, &file_info)) { + && os_fileinfo_link((char *)mfp->mf_fname, &file_info)) { mfp->mf_fd = -1; EMSG(_("E300: Swap file already exists (symlink attack?)")); } else { |