From 022f9ef16c955d6b5fca0f53b79899c56a3966c5 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 2 Jul 2022 17:36:31 +0100 Subject: patch 9.0.0028: MS-Windows: tests fail if there is a "runtime" directory Problem: MS-Windows: tests fail if there is a stray "runtime" directory. Solution: Only use a "runtime" directory if it contains "defaults.vim". --- src/filepath.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'src/filepath.c') diff --git a/src/filepath.c b/src/filepath.c index 854d823c97..f1ae18e0bd 100644 --- a/src/filepath.c +++ b/src/filepath.c @@ -774,6 +774,26 @@ shorten_dir(char_u *str) shorten_dir_len(str, 1); } +/* + * Return TRUE if "fname" is a readable file. + */ + int +file_is_readable(char_u *fname) +{ + int fd; + +#ifndef O_NONBLOCK +# define O_NONBLOCK 0 +#endif + if (*fname && !mch_isdir(fname) + && (fd = mch_open((char *)fname, O_RDONLY | O_NONBLOCK, 0)) >= 0) + { + close(fd); + return TRUE; + } + return FALSE; +} + #if defined(FEAT_EVAL) || defined(PROTO) /* @@ -893,26 +913,6 @@ f_exepath(typval_T *argvars, typval_T *rettv) rettv->vval.v_string = p; } -/* - * Return TRUE if "fname" is a readable file. - */ - int -file_is_readable(char_u *fname) -{ - int fd; - -#ifndef O_NONBLOCK -# define O_NONBLOCK 0 -#endif - if (*fname && !mch_isdir(fname) - && (fd = mch_open((char *)fname, O_RDONLY | O_NONBLOCK, 0)) >= 0) - { - close(fd); - return TRUE; - } - return FALSE; -} - /* * "filereadable()" function */ -- cgit v1.2.3