undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bb/diff-no-index-dotdot'

Browse Source 
* bb/diff-no-index-dotdot:
  diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()
  diff-no-index: rename read_directory()
This commit is contained in:
Junio C Hamano 2014-03-25 11:08:31 -07:00
commit 37943cc6b9
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
diff-no-index.c
View File

@ -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;
}