diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-08-17 01:10:16 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-08-17 01:10:16 -0400 |
| commit | 14d2a90db984c1a0360727c4d9b8337a689fccec (patch) | |
| tree | 391f6090eecd62f9543ed4772d27c8b0b5e8fb00 /src/nvim/eval.c | |
| parent | 616b787d129b3550dc4b103868cf09e267195210 (diff) | |
| parent | 86c38ef1264f0896510abe7b6eb1f1915986b594 (diff) | |
| download | rneovim-14d2a90db984c1a0360727c4d9b8337a689fccec.tar.gz rneovim-14d2a90db984c1a0360727c4d9b8337a689fccec.tar.bz2 rneovim-14d2a90db984c1a0360727c4d9b8337a689fccec.zip | |
Merge pull request #3166 from justinmk/file_is_readable
os_file_is_readable()
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index c7c67cfca4..bf9a219e28 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -8562,27 +8562,12 @@ static void f_feedkeys(typval_T *argvars, typval_T *rettv) } } -/* - * "filereadable()" function - */ +/// "filereadable()" function static void f_filereadable(typval_T *argvars, typval_T *rettv) { - int fd; - char_u *p; - int n; - -#ifndef O_NONBLOCK -# define O_NONBLOCK 0 -#endif - p = get_tv_string(&argvars[0]); - if (*p && !os_isdir(p) && (fd = os_open((char *)p, - O_RDONLY | O_NONBLOCK, 0)) >= 0) { - n = TRUE; - close(fd); - } else - n = FALSE; - - rettv->vval.v_number = n; + char_u *p = get_tv_string(&argvars[0]); + rettv->vval.v_number = + (*p && !os_isdir(p) && os_file_is_readable((char*)p)); } /* |