undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove_dir_recurse(): handle disappearing files and directories

Browse Source 
If a file or directory that we are trying to remove disappears (e.g.,
because another process has pruned it), do not consider it an error.

However, if REMOVE_DIR_KEEP_TOPLEVEL is set, and the toplevel
directory is missing, then consider it an error (like before).

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2014-01-18 23:48:57 +01:00 committed by Junio C Hamano
parent ecb2c282c0
commit 863808cd1a
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dir.c
View File

@ -1476,7 +1476,9 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
flag &= ~REMOVE_DIR_KEEP_TOPLEVEL; flag &= ~REMOVE_DIR_KEEP_TOPLEVEL;
dir = opendir(path->buf); dir = opendir(path->buf);
if (!dir) { if (!dir) {
if (errno == EACCES && !keep_toplevel) if (errno == ENOENT)
return keep_toplevel ? -1 : 0;
else if (errno == EACCES && !keep_toplevel)
/* /*
* An empty dir could be removable even if it * An empty dir could be removable even if it
* is unreadable: * is unreadable:
@ -1496,13 +1498,21 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
strbuf_setlen(path, len); strbuf_setlen(path, len);
strbuf_addstr(path, e->d_name); strbuf_addstr(path, e->d_name);
if (lstat(path->buf, &st)) if (lstat(path->buf, &st)) {
; /* fall thru */ if (errno == ENOENT)
else if (S_ISDIR(st.st_mode)) { /*
* file disappeared, which is what we
* wanted anyway
*/
continue;
/* fall thru */
} else if (S_ISDIR(st.st_mode)) {
if (!remove_dir_recurse(path, flag, &kept_down)) if (!remove_dir_recurse(path, flag, &kept_down))
continue; /* happy */ continue; /* happy */
} else if (!only_empty && !unlink(path->buf)) } else if (!only_empty &&
(!unlink(path->buf) || errno == ENOENT)) {
continue; /* happy, too */ continue; /* happy, too */
}
/* path too long, stat fails, or non-directory still exists */ /* path too long, stat fails, or non-directory still exists */
ret = -1; ret = -1;
@ -1512,7 +1522,7 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
strbuf_setlen(path, original_len); strbuf_setlen(path, original_len);
if (!ret && !keep_toplevel && !kept_down) if (!ret && !keep_toplevel && !kept_down)
ret = rmdir(path->buf); ret = (!rmdir(path->buf) || errno == ENOENT) ? 0 : -1;
else if (kept_up) else if (kept_up)
/* /*
* report the uplevel that it is not an error that we * report the uplevel that it is not an error that we