From: Junio C Hamano <gitster@pobox.com>
To: Matheus Tavares Bernardino <matheus.bernardino@usp.br>
Cc: otalpster@gmail.com, git <git@vger.kernel.org>,
Michael Haggerty <mhagger@alum.mit.edu>
Subject: Re: [PATCH] entry.c: use dir-iterator to avoid explicit dir traversal
Date: Mon, 09 Dec 2019 13:18:12 -0800 [thread overview]
Message-ID: <xmqqv9qptcyz.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CAHd-oW4MzH9Wrb2zNPF0JBN8+FRB4NtDX0166Qt2Kbqs0mDgcw@mail.gmail.com> (Matheus Tavares Bernardino's message of "Mon, 9 Dec 2019 14:41:31 -0300")
Matheus Tavares Bernardino <matheus.bernardino@usp.br> writes:
>> The changes pass the test suite t/ and Travis CI.
>> Please point out any mistakes.
>> ...
>> - 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)) {
>
> unlink()-ing a directory in Linux will return a EISDIR error. So I
> think you still need to use S_ISDIR() to check if iter->path.buf is a
> directory and call rmdir(), in this case.
>
> However, note that the dir-iterator API gives entries in pre-order.
> I.e. a directory appears before its subentries. In the use case of
> remove_subtree(), though, we need to traverse in post-order, since we
> have to remove the subentries before removing the directory where they
> reside. My suggestion is that you add a preliminary patch,
> implementing a new DIR_ITERATOR_POST_ORDER flag to dir-iterator.h, and
> then use it in this patch.
Thanks for a review and a few hints to nudge a new contributor in
the right direction. Very much appreciated.
I wonder why the bugs in this patch weren't caught by self test we
already have, by the way. We need a bit better test coverage,
perhaps?
next prev parent reply other threads:[~2019-12-09 21:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-08 18:04 [PATCH] entry.c: use dir-iterator to avoid explicit dir traversal otalpster
2019-12-09 15:21 ` Derrick Stolee
2019-12-09 17:41 ` Matheus Tavares Bernardino
2019-12-09 21:18 ` Junio C Hamano [this message]
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=xmqqv9qptcyz.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=matheus.bernardino@usp.br \
--cc=mhagger@alum.mit.edu \
--cc=otalpster@gmail.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).