From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 5 Apr 2022 14:31:01 +0000 (+0100)
Subject: patch 8.2.4696: delete() with "rf" argument does not report a failure
X-Git-Tag: v8.2.4696
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=478700336d1c72e133b8ff6841e968c1bb1658ed;p=vim

patch 8.2.4696: delete() with "rf" argument does not report a failure

Problem:    delete() with "rf" argument does not report a failure.
Solution:   Return -1 if the directory could not be removed. (closes #10078)
---

diff --git a/src/fileio.c b/src/fileio.c
index 9ef2dbd3b..af915c665 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5017,13 +5017,16 @@ delete_recursive(char_u *name)
 		vim_snprintf((char *)NameBuff, MAXPATHL, "%s/%s", exp,
 					    ((char_u **)ga.ga_data)[i]);
 		if (delete_recursive(NameBuff) != 0)
+		    // Remember the failure but continue deleting any further
+		    // entries.
 		    result = -1;
 	    }
 	    ga_clear_strings(&ga);
+	    if (mch_rmdir(exp) != 0)
+		result = -1;
 	}
 	else
 	    result = -1;
-	(void)mch_rmdir(exp);
 	vim_free(exp);
     }
     else
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index a19dd5271..a87ca3b58 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -2242,6 +2242,15 @@ func Test_delete_rf()
   call assert_equal(0, delete('Xdir', 'rf'))
   call assert_false(filereadable('Xdir/foo.txt'))
   call assert_false(filereadable('Xdir/[a-1]/foo.txt'))
+
+  if has('unix')
+    call mkdir('Xdir/Xdir2', 'p')
+    silent !chmod 555 Xdir
+    call assert_equal(-1, delete('Xdir/Xdir2', 'rf'))
+    call assert_equal(-1, delete('Xdir', 'rf'))
+    silent !chmod 755 Xdir
+    call assert_equal(0, delete('Xdir', 'rf'))
+  endif
 endfunc
 
 func Test_call()
diff --git a/src/version.c b/src/version.c
index f4d300b39..0e42966d9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4696,
 /**/
     4695,
 /**/