From aa378acdf51daf235c7e721cfa646d115d8708f0 Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Fri, 8 Aug 2014 16:25:33 +0200 Subject: fileinfo: implement os_fileinfo_size this replaces os_get_file_size and file_info.stat.st_size --- src/nvim/eval.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/nvim/eval.c') diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 34af143446..ff436a5d75 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_get_file_info(fname, &file_info)) { + off_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 ((off_t)rettv->vval.v_number != filesize) { rettv->vval.v_number = -2; } } -- cgit From 5d074a0aa6b307a11ee572db6bf48ca17c3a8a23 Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Wed, 27 Aug 2014 19:14:44 +0200 Subject: fileinfo: rename os_get_file_info{,_link,_fd} --- src/nvim/eval.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/nvim/eval.c') diff --git a/src/nvim/eval.c b/src/nvim/eval.c index ff436a5d75..b1943bae86 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -9166,7 +9166,7 @@ static void f_getfsize(typval_T *argvars, typval_T *rettv) rettv->v_type = VAR_NUMBER; FileInfo file_info; - if (os_get_file_info(fname, &file_info)) { + if (os_fileinfo(fname, &file_info)) { off_t filesize = os_fileinfo_size(&file_info); if (os_isdir((char_u *)fname)) rettv->vval.v_number = 0; @@ -9191,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; @@ -9211,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)) -- cgit From 7ac191ab1085875319e139b044ec1f98498b87ce Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Wed, 27 Aug 2014 22:36:38 +0200 Subject: fileinfo: change returntype of os_fileinfo_size off_t -> uint64_t --- src/nvim/eval.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim/eval.c') diff --git a/src/nvim/eval.c b/src/nvim/eval.c index b1943bae86..a9570ecc84 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -9167,14 +9167,14 @@ static void f_getfsize(typval_T *argvars, typval_T *rettv) FileInfo file_info; if (os_fileinfo(fname, &file_info)) { - off_t filesize = os_fileinfo_size(&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)filesize; /* non-perfect check for overflow */ - if ((off_t)rettv->vval.v_number != filesize) { + if ((uint64_t)rettv->vval.v_number != filesize) { rettv->vval.v_number = -2; } } -- cgit