Commit c844a803 authored by Junio C Hamano's avatar Junio C Hamano

remove_dir_recursively(): Add flag for skipping removal of toplevel dir

Add the REMOVE_DIR_KEEP_TOPLEVEL flag to remove_dir_recursively() for
deleting everything inside the given directory, but _not_ the given
directory itself.

Note that this does not pass the REMOVE_DIR_KEEP_NESTED_GIT flag, if set,
to the recursive invocations of remove_dir_recursively().  It is likely to
be a a bug that has been present since REMOVE_DIR_KEEP_NESTED_GIT was
introduced (a0f4afbe), but this commit keeps the same behaviour for now.
Signed-off-by: default avatarJohan Herland <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 0dbe6592
...@@ -1178,6 +1178,7 @@ int remove_dir_recursively(struct strbuf *path, int flag) ...@@ -1178,6 +1178,7 @@ int remove_dir_recursively(struct strbuf *path, int flag)
struct dirent *e; struct dirent *e;
int ret = 0, original_len = path->len, len; int ret = 0, original_len = path->len, len;
int only_empty = (flag & REMOVE_DIR_EMPTY_ONLY); int only_empty = (flag & REMOVE_DIR_EMPTY_ONLY);
int keep_toplevel = (flag & REMOVE_DIR_KEEP_TOPLEVEL);
unsigned char submodule_head[20]; unsigned char submodule_head[20];
if ((flag & REMOVE_DIR_KEEP_NESTED_GIT) && if ((flag & REMOVE_DIR_KEEP_NESTED_GIT) &&
...@@ -1185,9 +1186,14 @@ int remove_dir_recursively(struct strbuf *path, int flag) ...@@ -1185,9 +1186,14 @@ int remove_dir_recursively(struct strbuf *path, int flag)
/* Do not descend and nuke a nested git work tree. */ /* Do not descend and nuke a nested git work tree. */
return 0; return 0;
flag &= ~(REMOVE_DIR_KEEP_TOPLEVEL|REMOVE_DIR_KEEP_NESTED_GIT);
dir = opendir(path->buf); dir = opendir(path->buf);
if (!dir) if (!dir) {
return rmdir(path->buf); if (!keep_toplevel)
return rmdir(path->buf);
else
return -1;
}
if (path->buf[original_len - 1] != '/') if (path->buf[original_len - 1] != '/')
strbuf_addch(path, '/'); strbuf_addch(path, '/');
...@@ -1202,7 +1208,7 @@ int remove_dir_recursively(struct strbuf *path, int flag) ...@@ -1202,7 +1208,7 @@ int remove_dir_recursively(struct strbuf *path, int flag)
if (lstat(path->buf, &st)) if (lstat(path->buf, &st))
; /* fall thru */ ; /* fall thru */
else if (S_ISDIR(st.st_mode)) { else if (S_ISDIR(st.st_mode)) {
if (!remove_dir_recursively(path, only_empty)) if (!remove_dir_recursively(path, flag))
continue; /* happy */ continue; /* happy */
} else if (!only_empty && !unlink(path->buf)) } else if (!only_empty && !unlink(path->buf))
continue; /* happy, too */ continue; /* happy, too */
...@@ -1214,7 +1220,7 @@ int remove_dir_recursively(struct strbuf *path, int flag) ...@@ -1214,7 +1220,7 @@ int remove_dir_recursively(struct strbuf *path, int flag)
closedir(dir); closedir(dir);
strbuf_setlen(path, original_len); strbuf_setlen(path, original_len);
if (!ret) if (!ret && !keep_toplevel)
ret = rmdir(path->buf); ret = rmdir(path->buf);
return ret; return ret;
} }
......
...@@ -102,6 +102,7 @@ extern void setup_standard_excludes(struct dir_struct *dir); ...@@ -102,6 +102,7 @@ extern void setup_standard_excludes(struct dir_struct *dir);
#define REMOVE_DIR_EMPTY_ONLY 01 #define REMOVE_DIR_EMPTY_ONLY 01
#define REMOVE_DIR_KEEP_NESTED_GIT 02 #define REMOVE_DIR_KEEP_NESTED_GIT 02
#define REMOVE_DIR_KEEP_TOPLEVEL 04
extern int remove_dir_recursively(struct strbuf *path, int flag); extern int remove_dir_recursively(struct strbuf *path, int flag);
/* tries to remove the path with empty directories along it, ignores ENOENT */ /* tries to remove the path with empty directories along it, ignores ENOENT */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment