From: otalpster@gmail.com
To: git@vger.kernel.org
Cc: mhagger@alum.mit.edu, matheus.bernardino@usp.br,
Plato <otalpster@gmail.com>
Subject: [PATCH] entry.c: use dir-iterator to avoid explicit dir traversal
Date: Sun, 8 Dec 2019 20:04:39 +0200 [thread overview]
Message-ID: <20191208180439.19018-1-otalpster@gmail.com> (raw)
From: Plato <otalpster@gmail.com>
Replace usage of opendir/readdir/closedir API to traverse directories
recursively, at remove_subtree() function, by the dir-iterator API. This
simplifies the code and avoids recursive calls to remove_subtree().
Signed-off-by: Plato <otalpster@gmail.com>
---
Hello,
This is my first patch.
I hope I cc'd the correct people and didn't mess up.
The changes pass the test suite t/ and Travis CI.
Please point out any mistakes.
Thanks for your time! :)
entry.c | 32 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/entry.c b/entry.c
index 53380bb614..e7f4881d3b 100644
--- a/entry.c
+++ b/entry.c
@@ -2,6 +2,8 @@
#include "blob.h"
#include "object-store.h"
#include "dir.h"
+#include "iterator.h"
+#include "dir-iterator.h"
#include "streaming.h"
#include "submodule.h"
#include "progress.h"
@@ -50,29 +52,25 @@ 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;
- int origlen = path->len;
+ int ok;
+ unsigned int flags = DIR_ITERATOR_PEDANTIC;
+ struct dir_iterator *iter = dir_iterator_begin(path->buf, flags);
- if (!dir)
+ if (!iter)
die_errno("cannot opendir '%s'", path->buf);
- while ((de = readdir(dir)) != NULL) {
- struct stat st;
- if (is_dot_or_dotdot(de->d_name))
+ while ((ok = dir_iterator_advance(iter)) == ITER_OK) {
+ if (is_dot_or_dotdot(iter->path.buf))
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);
+ if (unlink(iter->path.buf)) {
+ die_errno("cannot unlink '%s'", iter->path.buf);
+ }
}
- closedir(dir);
+
+ if (ok != ITER_DONE)
+ die(_("failed to iterate over '%s'"), path->buf);
+
if (rmdir(path->buf))
die_errno("cannot rmdir '%s'", path->buf);
}
--
2.24.0
next reply other threads:[~2019-12-08 18:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-08 18:04 otalpster [this message]
2019-12-09 15:21 ` [PATCH] entry.c: use dir-iterator to avoid explicit dir traversal Derrick Stolee
2019-12-09 17:41 ` Matheus Tavares Bernardino
2019-12-09 21:18 ` Junio C Hamano
2019-12-10 4:38 ` Matheus Tavares Bernardino
2019-12-16 16:12 ` otalpster
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=20191208180439.19018-1-otalpster@gmail.com \
--to=otalpster@gmail.com \
--cc=git@vger.kernel.org \
--cc=matheus.bernardino@usp.br \
--cc=mhagger@alum.mit.edu \
/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).