summaryrefslogtreecommitdiff
path: root/diff-no-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-25 11:08:31 -0700
committerJunio C Hamano <gitster@pobox.com>2014-03-25 11:08:31 -0700
commit37943cc6b9a24c1636472f670aba972d12757ba7 (patch)
tree7e52f64288997760f6a8ebc93d79cd13ca3cfd46 /diff-no-index.c
parentcf30bfb8fb9e749637a73685a8de9600ab1fbe5f (diff)
parentfd3aeeab0d41474af86e41d207196abbb7bf78f6 (diff)
downloadgit-37943cc6b9a24c1636472f670aba972d12757ba7.tar.gz
Merge branch 'bb/diff-no-index-dotdot'
* bb/diff-no-index-dotdot: diff-no-index: replace manual "."/".." check with is_dot_or_dotdot() diff-no-index: rename read_directory()
Diffstat (limited to 'diff-no-index.c')
-rw-r--r--diff-no-index.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/diff-no-index.c b/diff-no-index.c
index 8e10bff30e..c554691df0 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -15,8 +15,9 @@
#include "log-tree.h"
#include "builtin.h"
#include "string-list.h"
+#include "dir.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;
@@ -25,7 +26,7 @@ static int read_directory(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);
@@ -107,9 +108,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;
}