From: Daniel Ferreira <bnmvco@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, sbeller@google.com, pclouds@gmail.com,
mhagger@alum.mit.edu, Daniel Ferreira <bnmvco@gmail.com>
Subject: [PATCH v10 5/5] remove_subtree(): reimplement using iterators
Date: Wed, 19 Apr 2017 10:14:12 -0300 [thread overview]
Message-ID: <1492607652-36341-6-git-send-email-bnmvco@gmail.com> (raw)
In-Reply-To: <1492607652-36341-1-git-send-email-bnmvco@gmail.com>
Use dir_iterator to traverse through remove_subtree()'s directory tree,
avoiding the need for recursive calls to readdir(). Simplify
remove_subtree()'s code.
A conversion similar in purpose was previously done at 46d092a
("for_each_reflog(): reimplement using iterators", 2016-05-21).
Signed-off-by: Daniel Ferreira <bnmvco@gmail.com>
---
entry.c | 42 ++++++++++++++++--------------------------
1 file changed, 16 insertions(+), 26 deletions(-)
diff --git a/entry.c b/entry.c
index d2b512d..a939432 100644
--- a/entry.c
+++ b/entry.c
@@ -3,6 +3,8 @@
#include "dir.h"
#include "streaming.h"
#include "submodule.h"
+#include "iterator.h"
+#include "dir-iterator.h"
static void create_directories(const char *path, int path_len,
const struct checkout *state)
@@ -45,33 +47,21 @@ static void create_directories(const char *path, int path_len,
free(buf);
}
-static void remove_subtree(struct strbuf *path)
+static void remove_subtree(const char *path)
{
- DIR *dir = opendir(path->buf);
- struct dirent *de;
- 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;
-
- 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))
- die_errno("cannot unlink '%s'", path->buf);
- strbuf_setlen(path, origlen);
+ struct dir_iterator *diter = dir_iterator_begin(path,
+ DIR_ITERATOR_POST_ORDER_TRAVERSAL | DIR_ITERATOR_LIST_ROOT_DIR);
+ if (!diter) {
+ die_errno("cannot remove path '%s'", path);
+ }
+
+ while (dir_iterator_advance(diter) == ITER_OK) {
+ if (S_ISDIR(diter->st.st_mode)) {
+ if (rmdir(diter->path.buf))
+ die_errno("cannot rmdir '%s'", diter->path.buf);
+ } else if (unlink(diter->path.buf))
+ die_errno("cannot unlink '%s'", diter->path.buf);
}
- closedir(dir);
- if (rmdir(path->buf))
- die_errno("cannot rmdir '%s'", path->buf);
}
static int create_file(const char *path, unsigned int mode)
@@ -312,7 +302,7 @@ int checkout_entry(struct cache_entry *ce,
return 0;
if (!state->force)
return error("%s is a directory", path.buf);
- remove_subtree(&path);
+ remove_subtree(path.buf);
} else if (unlink(path.buf))
return error_errno("unable to unlink old '%s'", path.buf);
} else if (state->not_new)
--
2.7.4 (Apple Git-66)
next prev parent reply other threads:[~2017-04-19 13:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-19 13:14 [PATCH v10 0/5] [GSoC] remove_subtree(): reimplement using iterators Daniel Ferreira
2017-04-19 13:14 ` [PATCH v10 1/5] dir_iterator: add tests for dir_iterator API Daniel Ferreira
2017-04-19 13:14 ` [PATCH v10 2/5] remove_subtree(): test removing nested directories Daniel Ferreira
2017-04-19 13:14 ` [PATCH v10 3/5] dir_iterator: refactor dir_iterator_advance Daniel Ferreira
2017-04-19 13:14 ` [PATCH v10 4/5] dir_iterator: rewrite state machine model Daniel Ferreira
2017-04-20 3:30 ` Junio C Hamano
2017-04-20 9:36 ` Michael Haggerty
2017-04-19 13:14 ` Daniel Ferreira [this message]
2017-04-20 3:23 ` [PATCH v10 0/5] [GSoC] remove_subtree(): reimplement using iterators Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1492607652-36341-6-git-send-email-bnmvco@gmail.com \
--to=bnmvco@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
--cc=pclouds@gmail.com \
--cc=sbeller@google.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).