diff options
author | Junio C Hamano <junkio@cox.net> | 2006-12-29 21:08:19 +0300 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-12-29 21:08:19 +0300 |
commit | c889763bf33e9b54843dc93ba3bb38803f86a6cf (patch) | |
tree | a8bcfbf97425de0ca6bc1b41c1a06ad9eb3162bd | |
parent | 8757749ecbabbcf7f1a68c17529f02bf7702b424 (diff) |
Revert "read_directory: show_both option."
This reverts commit 4888c534099012d71d24051deb5b14319747bd1a.
-rw-r--r-- | dir.c | 19 | ||||
-rw-r--r-- | dir.h | 6 |
2 files changed, 9 insertions, 16 deletions
@@ -260,8 +260,7 @@ int excluded(struct dir_struct *dir, const char *pathname) return 0; } -static void add_name(struct dir_struct *dir, const char *pathname, int len, - int ignored_entry) +static void add_name(struct dir_struct *dir, const char *pathname, int len) { struct dir_entry *ent; @@ -274,7 +273,6 @@ static void add_name(struct dir_struct *dir, const char *pathname, int len, dir->entries = xrealloc(dir->entries, alloc*sizeof(ent)); } ent = xmalloc(sizeof(*ent) + len + 1); - ent->ignored_entry = ignored_entry; ent->len = len; memcpy(ent->name, pathname, len); ent->name[len] = 0; @@ -316,7 +314,6 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co while ((de = readdir(fdir)) != NULL) { int len; - int ignored_entry; if ((de->d_name[0] == '.') && (de->d_name[1] == 0 || @@ -325,12 +322,11 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co continue; len = strlen(de->d_name); memcpy(fullname + baselen, de->d_name, len+1); - ignored_entry = excluded(dir, fullname); - - if (!dir->show_both && - (ignored_entry != dir->show_ignored) && - (!dir->show_ignored || DTYPE(de) != DT_DIR)) - continue; + if (excluded(dir, fullname) != dir->show_ignored) { + if (!dir->show_ignored || DTYPE(de) != DT_DIR) { + continue; + } + } switch (DTYPE(de)) { struct stat st; @@ -368,8 +364,7 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co if (check_only) goto exit_early; else - add_name(dir, fullname, baselen + len, - ignored_entry); + add_name(dir, fullname, baselen + len); } exit_early: closedir(fdir); @@ -13,8 +13,7 @@ struct dir_entry { - unsigned ignored_entry : 1; - unsigned int len : 15; + int len; char name[FLEX_ARRAY]; /* more */ }; @@ -30,8 +29,7 @@ struct exclude_list { struct dir_struct { int nr, alloc; - unsigned int show_both: 1, - show_ignored:1, + unsigned int show_ignored:1, show_other_directories:1, hide_empty_directories:1; struct dir_entry **entries; |