git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andrei Dinu <mandrei.dinu@gmail.com>
To: git@vger.kernel.org
Cc: Andrei Dinu <mandrei.dinu@gmail.com>
Subject: [PATCH 1/3] diff-no-index.c read_directory() use is_dot_or_dotdot().
Date: Wed, 19 Mar 2014 17:16:20 +0200	[thread overview]
Message-ID: <1395242180-4559-1-git-send-email-mandrei.dinu@gmail.com> (raw)

Implement read_directory() to use is_dot_or_dotdot() function from dir.h
instead of strcmp().

Rename read_directory() in read_directory_path() to avoid conflicting with
read_directory() from dir.h.

Signed-off-by: Andrei Dinu <mandrei.dinu@gmail.com>


---
 I plan on applying to GSoc 2014.

 diff-no-index.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/diff-no-index.c b/diff-no-index.c
index 8e10bff..2d1165f 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_path(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_path(name1, &p1))
 			return -1;
-		if (name2 && read_directory(name2, &p2)) {
+		if (name2 && read_directory_path(name2, &p2)) {
 			string_list_clear(&p1, 0);
 			return -1;
 		}
-- 
1.7.9.5

             reply	other threads:[~2014-03-19 15:16 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-19 15:16 Andrei Dinu [this message]
2014-03-19 15:21 ` [PATCH 1/3] diff-no-index.c read_directory() use is_dot_or_dotdot() Matthieu Moy

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1395242180-4559-1-git-send-email-mandrei.dinu@gmail.com \
    --to=mandrei.dinu@gmail.com \
    --cc=git@vger.kernel.org \
    /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.
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 NNTP newsgroup(s).