Mercurial > vim

diff src/fileio.c @ 28341:0390c4848b27 v8.2.4696

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.4696: delete() with "rf" argument does not report a failure Commit: https://github.com/vim/vim/commit/478700336d1c72e133b8ff6841e968c1bb1658ed Author: zeertzjq <zeertzjq@outlook.com> Date: Tue Apr 5 15:31:01 2022 +0100 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 https://github.com/vim/vim/issues/10078)
author Bram Moolenaar <Bram@vim.org>
date Tue, 05 Apr 2022 16:45:03 +0200
parents bef82285dda0
children 86b6432aa1d8
line wrap: on
line diff
--- 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