Re: [PATCHv2] mingw_rmdir: do not prompt for retry when non-empty
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:55:30
Erik Faye-Lund [off-list ref] writes:
in ab1a11be ("mingw_rmdir: set errno=ENOTEMPTY when appropriate"),
a check was added to prevent us from retrying to delete a directory
that is both in use and non-empty.
However, this logic was slightly flawed; since we didn't return
immediately, we end up falling out of the retry-loop, but right into
the prompting-loop.
Fix this by setting errno, and guarding the prompting-loop with an
errno-check.
Signed-off-by: Erik Faye-Lund <redacted>
---
Here's the second version of this patch, sorry for the slight delay.Is this meant for me, or is it to be applied to msysgit and later somehow fed to me in different form? I can s/_wrmdir/rmdir/;s/wpathname/pathname/ if that is what you want me to do, but otherwise this patch does not apply.
quoted hunk
compat/mingw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)diff --git a/compat/mingw.c b/compat/mingw.c index 1eb974f..440224c 100644 --- a/compat/mingw.c +++ b/compat/mingw.c@@ -260,6 +260,8 @@ int mingw_rmdir(const char *pathname) while ((ret = _wrmdir(wpathname)) == -1 && tries < ARRAY_SIZE(delay)) { if (!is_file_in_use_error(GetLastError())) + errno = err_win_to_posix(GetLastError()); + if (errno != EACCES) break; if (!is_dir_empty(wpathname)) { errno = ENOTEMPTY;@@ -275,7 +277,7 @@ int mingw_rmdir(const char *pathname) Sleep(delay[tries]); tries++; } - while (ret == -1 && is_file_in_use_error(GetLastError()) && + while (ret == -1 && errno == EACCES && is_file_in_use_error(GetLastError()) && ask_yes_no_if_possible("Deletion of directory '%s' failed. " "Should I try again?", pathname)) ret = _wrmdir(wpathname);
-- *** Please reply-to-all at all times *** *** (do not pretend to know who is subscribed and who is not) *** *** Please avoid top-posting. *** The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free. You received this message because you are subscribed to the Google Groups "msysGit" group. To post to this group, send email to msysgit@googlegroups.com To unsubscribe from this group, send email to msysgit+unsubscribe@googlegroups.com For more options, and view previous threads, visit this group at http://groups.google.com/group/msysgit?hl=en_US?hl=en