From 9daf0ef065bfef4fb9dcc1710a39a8177695c84f Mon Sep 17 00:00:00 2001 From: Brian Bourn Date: Wed, 19 Mar 2014 11:58:21 -0400 Subject: [PATCH 1/2] diff-no-index: rename read_directory() In the next patch, we will replace a manual checking of "." or ".." with a call to is_dot_or_dotdot() defined in dir.h. The private function read_directory() defined in this file will conflict with the global function declared there when we do so. As a preparatory step, rename the private read_directory() to avoid the name collision. Helped-by: Eric Sunshine Signed-off-by: Brian Bourn Signed-off-by: Junio C Hamano --- diff-no-index.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/diff-no-index.c b/diff-no-index.c index 33e5982a1c..3e4f47e1d8 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -16,7 +16,7 @@ #include "builtin.h" #include "string-list.h" -static int read_directory(const char *path, struct string_list *list) +static int read_directory_contents(const char *path, struct string_list *list) { DIR *dir; struct dirent *e; @@ -107,9 +107,9 @@ static int queue_diff(struct diff_options *o, int i1, i2, ret = 0; size_t len1 = 0, len2 = 0; - if (name1 && read_directory(name1, &p1)) + if (name1 && read_directory_contents(name1, &p1)) return -1; - if (name2 && read_directory(name2, &p2)) { + if (name2 && read_directory_contents(name2, &p2)) { string_list_clear(&p1, 0); return -1; } From fd3aeeab0d41474af86e41d207196abbb7bf78f6 Mon Sep 17 00:00:00 2001 From: Brian Bourn Date: Wed, 19 Mar 2014 11:58:22 -0400 Subject: [PATCH 2/2] diff-no-index: replace manual "."/".." check with is_dot_or_dotdot() Helped-by: Eric Sunshine Signed-off-by: Brian Bourn Signed-off-by: Junio C Hamano --- diff-no-index.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/diff-no-index.c b/diff-no-index.c index 3e4f47e1d8..c881708ddd 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -15,6 +15,7 @@ #include "log-tree.h" #include "builtin.h" #include "string-list.h" +#include "dir.h" static int read_directory_contents(const char *path, struct string_list *list) { @@ -25,7 +26,7 @@ static int read_directory_contents(const char *path, struct string_list *list) return error("Could not open directory %s", path); while ((e = readdir(dir))) - if (strcmp(".", e->d_name) && strcmp("..", e->d_name)) + if (!is_dot_or_dotdot(e->d_name)) string_list_insert(list, e->d_name); closedir(dir);