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/eval.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/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 34af143446..a9570ecc84 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -9165,15 +9165,16 @@ static void f_getfsize(typval_T *argvars, typval_T *rettv) rettv->v_type = VAR_NUMBER; - off_t file_size; - if (os_get_file_size(fname, &file_size)) { + FileInfo file_info; + if (os_fileinfo(fname, &file_info)) { + uint64_t filesize = os_fileinfo_size(&file_info); if (os_isdir((char_u *)fname)) rettv->vval.v_number = 0; else { - rettv->vval.v_number = (varnumber_T)file_size; + rettv->vval.v_number = (varnumber_T)filesize; /* non-perfect check for overflow */ - if ((off_t)rettv->vval.v_number != file_size) { + if ((uint64_t)rettv->vval.v_number != filesize) { rettv->vval.v_number = -2; } } @@ -9190,7 +9191,7 @@ static void f_getftime(typval_T *argvars, typval_T *rettv) char *fname = (char *)get_tv_string(&argvars[0]); FileInfo file_info; - if (os_get_file_info(fname, &file_info)) { + if (os_fileinfo(fname, &file_info)) { rettv->vval.v_number = (varnumber_T)file_info.stat.st_mtim.tv_sec; } else { rettv->vval.v_number = -1; @@ -9210,7 +9211,7 @@ static void f_getftype(typval_T *argvars, typval_T *rettv) rettv->v_type = VAR_STRING; FileInfo file_info; - if (os_get_file_info_link((char *)fname, &file_info)) { + if (os_fileinfo_link((char *)fname, &file_info)) { uint64_t mode = file_info.stat.st_mode; #ifdef S_ISREG if (S_ISREG(mode)) |