patch 8.2.0888: readdirex() returns size -2 for a directory
Problem: Readdirex() returns size -2 for a directory.
Solution: Add missing "else". (Ken Takata, closes #6185)
diff --git a/src/fileio.c b/src/fileio.c
index e71b639..4da3afc 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4575,7 +4575,7 @@
if (S_ISDIR(st.st_mode))
size = 0;
// non-perfect check for overflow
- if ((off_T)size != (off_T)st.st_size)
+ else if ((off_T)size != (off_T)st.st_size)
size = -2;
if (dict_add_number(item, "size", size) == FAIL)
goto theend;
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index a82c70b..1de9c4c 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -1864,13 +1864,15 @@
func Test_readdirex()
call mkdir('Xdir')
- call writefile([], 'Xdir/foo.txt')
- call writefile([], 'Xdir/bar.txt')
+ call writefile(['foo'], 'Xdir/foo.txt')
+ call writefile(['barbar'], 'Xdir/bar.txt')
call mkdir('Xdir/dir')
" All results
let files = readdirex('Xdir')->map({-> v:val.name})
call assert_equal(['bar.txt', 'dir', 'foo.txt'], sort(files))
+ let sizes = readdirex('Xdir')->map({-> v:val.size})
+ call assert_equal([0, 4, 7], sort(sizes))
" Only results containing "f"
let files = 'Xdir'->readdirex({ e -> stridx(e.name, 'f') != -1 })
diff --git a/src/version.c b/src/version.c
index 91d4a46..9522510 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 888,
+/**/
887,
/**/
886,