Uses dir_iterator to traverse through remove_subtree()'s directory tree, avoiding the need for recursive calls to readdir() and simplifying code.
Suggested in the GSoC microproject list, as well as: https://public-inbox.org/git/xmqqk27m4h3h....@gitster.mtv.corp.google.com/ A conversion similar in purpose was previously done at 46d092a ("for_each_reflog(): reimplement using iterators", 2016-05-21). Signed-off-by: Daniel Ferreira <bnm...@gmail.com> --- Hey there! This is my microproject for Google Summer of Code on git. It has passed on Travis CI (https://travis-ci.org/theiostream/git), although I would appreciate any suggestion to improve test coverage for the affected function. This is, to my knowledge, one of the few microprojects that have not yet been started by someone on this list, but please let me know if someone else is already on it. Thank you. entry.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/entry.c b/entry.c index c6eea24..a88c219 100644 --- a/entry.c +++ b/entry.c @@ -2,6 +2,8 @@ #include "blob.h" #include "dir.h" #include "streaming.h" +#include "iterator.h" +#include "dir-iterator.h" static void create_directories(const char *path, int path_len, const struct checkout *state) @@ -46,29 +48,17 @@ static void create_directories(const char *path, int path_len, static void remove_subtree(struct strbuf *path) { - DIR *dir = opendir(path->buf); - struct dirent *de; + struct dir_iterator *diter = dir_iterator_begin(path->buf); int origlen = path->len; - if (!dir) - die_errno("cannot opendir '%s'", path->buf); - while ((de = readdir(dir)) != NULL) { - struct stat st; - - if (is_dot_or_dotdot(de->d_name)) - continue; - + while (dir_iterator_advance(diter) == ITER_OK) { strbuf_addch(path, '/'); - strbuf_addstr(path, de->d_name); - if (lstat(path->buf, &st)) - die_errno("cannot lstat '%s'", path->buf); - if (S_ISDIR(st.st_mode)) - remove_subtree(path); - else if (unlink(path->buf)) + strbuf_addstr(path, diter->relative_path); + if (unlink(path->buf)) die_errno("cannot unlink '%s'", path->buf); strbuf_setlen(path, origlen); } - closedir(dir); + if (rmdir(path->buf)) die_errno("cannot rmdir '%s'", path->buf); } -- 2.7.4 (Apple Git-66)
