From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v3 12/17] remove_dir_recurse(): tighten condition for removing unreadable dir
Date: Sat, 18 Jan 2014 23:48:56 +0100 [thread overview]
Message-ID: <1390085341-2553-13-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1390085341-2553-1-git-send-email-mhagger@alum.mit.edu>
If opendir() fails on the top-level directory, it makes sense to try
to delete it anyway--but only if the failure was due to EACCES.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
dir.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dir.c b/dir.c
index d10a63f..785a83e 100644
--- a/dir.c
+++ b/dir.c
@@ -1511,8 +1511,11 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
flag &= ~REMOVE_DIR_KEEP_TOPLEVEL;
dir = opendir(path->buf);
if (!dir) {
- /* an empty dir could be removed even if it is unreadble */
- if (!keep_toplevel)
+ if (errno == EACCES && !keep_toplevel)
+ /*
+ * An empty dir could be removable even if it
+ * is unreadable:
+ */
return rmdir(path->buf);
else
return -1;
--
1.8.5.2
next prev parent reply other threads:[~2014-01-18 22:50 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-18 22:48 [PATCH v3 00/17] Fix some mkdir/rmdir races Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 01/17] safe_create_leading_directories(): fix format of "if" chaining Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 02/17] safe_create_leading_directories(): reduce scope of local variable Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 03/17] safe_create_leading_directories(): add explicit "slash" pointer Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 04/17] safe_create_leading_directories(): rename local variable Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 05/17] safe_create_leading_directories(): split on first of multiple slashes Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 06/17] safe_create_leading_directories(): always restore slash at end of loop Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 07/17] safe_create_leading_directories(): introduce enum for return values Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 08/17] cmd_init_db(): when creating directories, handle errors conservatively Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 09/17] safe_create_leading_directories(): add new error value SCLD_VANISHED Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 10/17] lock_ref_sha1_basic(): on SCLD_VANISHED, retry Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 11/17] lock_ref_sha1_basic(): if locking fails with ENOENT, retry Michael Haggerty
2014-01-18 22:48 ` Michael Haggerty [this message]
2014-01-18 22:48 ` [PATCH v3 13/17] remove_dir_recurse(): handle disappearing files and directories Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 14/17] rename_ref(): extract function rename_tmp_log() Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 15/17] rename_tmp_log(): handle a possible mkdir/rmdir race Michael Haggerty
2014-01-18 22:49 ` [PATCH v3 16/17] rename_tmp_log(): limit the number of remote_empty_directories() attempts Michael Haggerty
2014-01-18 22:49 ` [PATCH v3 17/17] rename_tmp_log(): on SCLD_VANISHED, retry Michael Haggerty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1390085341-2553-13-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).