# [PATCH v5] fsck.c: fsck_tree() now use is_dot_or_dotdot(). 2 messages from 2014-03-19 to 2014-03-19. Participants: Andrei Dinu, Matthieu Moy. Thread: https://gitlist.dev/t/36232 ## Andrei Dinu, 2014-03-19 16:08 Subject: [PATCH v5] fsck.c: fsck_tree() now use is_dot_or_dotdot(). Message-ID: <1395245290-6677-1-git-send-email-mandrei.dinu@gmail.com> URL: https://gitlist.dev/e/1395245290-6677-1-git-send-email-mandrei.dinu%40gmail.com ``` Rewrite fsck_tree() to use is_dot_or_dotdot() from "dir.h". Signed-off-by: Andrei Dinu --- I try to find other sites that can use id_dot_or_dotdot() function. fsck.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fsck.c b/fsck.c index 64bf279..82a55ab 100644 --- a/fsck.c +++ b/fsck.c @@ -6,6 +6,7 @@ #include "commit.h" #include "tag.h" #include "fsck.h" +#include "dir.h" static int fsck_walk_tree(struct tree *tree, fsck_walk_func walk, void *data) { @@ -171,10 +172,12 @@ static int fsck_tree(struct tree *item, int strict, fsck_error error_func) has_full_path = 1; if (!*name) has_empty_name = 1; - if (!strcmp(name, ".")) - has_dot = 1; - if (!strcmp(name, "..")) - has_dotdot = 1; + if (is_dot_or_dotdot(name)) { + if (name[1] == '\0') + has_dot = 1; + else + has_dotdot = 1; + } if (!strcmp(name, ".git")) has_dotgit = 1; has_zero_pad |= *(char *)desc.buffer == '0'; -- 1.7.9.5 ``` ## Matthieu Moy, 2014-03-19 17:51 Subject: Re: [PATCH v5] fsck.c: fsck_tree() now use is_dot_or_dotdot(). Message-ID: URL: https://gitlist.dev/e/vpq61nadqkh.fsf%40anie.imag.fr In-Reply-To: <1395245290-6677-1-git-send-email-mandrei.dinu@gmail.com> ``` Andrei Dinu writes: > --- > I try to find other sites that can use id_dot_or_dotdot() function. This should also have been sent in the same series. > @@ -171,10 +172,12 @@ static int fsck_tree(struct tree *item, int strict, fsck_error error_func) > has_full_path = 1; > if (!*name) > has_empty_name = 1; > - if (!strcmp(name, ".")) > - has_dot = 1; > - if (!strcmp(name, "..")) > - has_dotdot = 1; > + if (is_dot_or_dotdot(name)) { > + if (name[1] == '\0') > + has_dot = 1; > + else > + has_dotdot = 1; > + } The indentation is wrong. Configure your text editor to show you tabs and spaces differently (e.g. M-x whitespace-mode RET in Emacs). Git uses tabs to indent, and only that. I find the old code much clearer than the new one. This "name[1] == '\0'" looks weird to test if name is the string ".". -- Matthieu Moy http://www-verimag.imag.fr/~moy/ ```