@matheusbsbs / matheus-bagliano / commits / c889763bf3
Fork 0

Revert "read_directory: show_both option."

This reverts commit 4888c534099012d71d24051deb5b14319747bd1a.

Junio C Hamano committed Dec 29, 2006 at 10:08 UTC c889763bf33e9b54843dc93ba3bb38803f86a6cf
2 files changed +9 -16
dir.c
+7 -12
@@ -260,8 +260,7 @@ int excluded(struct dir_struct *dir, const char *pathname)
260 return 0;
261 }
262
263 -static void add_name(struct dir_struct *dir, const char *pathname, int len,
264 - int ignored_entry)
263 +static void add_name(struct dir_struct *dir, const char *pathname, int len)
264 {
265 struct dir_entry *ent;
266
@@ -274,7 +273,6 @@ static void add_name(struct dir_struct *dir, const char *pathname, int len,
273 dir->entries = xrealloc(dir->entries, alloc*sizeof(ent));
274 }
275 ent = xmalloc(sizeof(*ent) + len + 1);
277 - ent->ignored_entry = ignored_entry;
276 ent->len = len;
277 memcpy(ent->name, pathname, len);
278 ent->name[len] = 0;
@@ -316,7 +314,6 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co
314
315 while ((de = readdir(fdir)) != NULL) {
316 int len;
319 - int ignored_entry;
317
318 if ((de->d_name[0] == '.') &&
319 (de->d_name[1] == 0 ||
@@ -325,12 +322,11 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co
322 continue;
323 len = strlen(de->d_name);
324 memcpy(fullname + baselen, de->d_name, len+1);
328 - ignored_entry = excluded(dir, fullname);
329 -
330 - if (!dir->show_both &&
331 - (ignored_entry != dir->show_ignored) &&
332 - (!dir->show_ignored || DTYPE(de) != DT_DIR))
333 - continue;
325 + if (excluded(dir, fullname) != dir->show_ignored) {
326 + if (!dir->show_ignored || DTYPE(de) != DT_DIR) {
327 + continue;
328 + }
329 + }
330
331 switch (DTYPE(de)) {
332 struct stat st;
@@ -368,8 +364,7 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co
364 if (check_only)
365 goto exit_early;
366 else
371 - add_name(dir, fullname, baselen + len,
372 - ignored_entry);
367 + add_name(dir, fullname, baselen + len);
368 }
369 exit_early:
370 closedir(fdir);
dir.h
+2 -4
@@ -13,8 +13,7 @@
13
14
15 struct dir_entry {
16 - unsigned ignored_entry : 1;
17 - unsigned int len : 15;
16 + int len;
17 char name[FLEX_ARRAY]; /* more */
18 };
19
@@ -30,8 +29,7 @@ struct exclude_list {
29
30 struct dir_struct {
31 int nr, alloc;
33 - unsigned int show_both: 1,
34 - show_ignored:1,
32 + unsigned int show_ignored:1,
33 show_other_directories:1,
34 hide_empty_directories:1;
35 struct dir_entry **entries;