read_directory: show_both option.
This teaches the internal read_directory() routine to return both interesting and ignored pathnames. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Dec 25, 2006 at 03:11 UTC
4888c534099012d71d24051deb5b14319747bd1a
2 files changed
+16
-9
dir.c
+12
-7
@@ -260,7 +260,8 @@ 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)
263
+static void add_name(struct dir_struct *dir, const char *pathname, int len,
264
+ int ignored_entry)
265
{
266
struct dir_entry *ent;
267
@@ -273,6 +274,7 @@ static void add_name(struct dir_struct *dir, const char *pathname, int len)
274
dir->entries = xrealloc(dir->entries, alloc*sizeof(ent));
275
}
276
ent = xmalloc(sizeof(*ent) + len + 1);
277
+ ent->ignored_entry = ignored_entry;
278
ent->len = len;
279
memcpy(ent->name, pathname, len);
280
ent->name[len] = 0;
@@ -314,6 +316,7 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co
316
317
while ((de = readdir(fdir)) != NULL) {
318
int len;
319
+ int ignored_entry;
320
321
if ((de->d_name[0] == '.') &&
322
(de->d_name[1] == 0 ||
@@ -322,11 +325,12 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co
325
continue;
326
len = strlen(de->d_name);
327
memcpy(fullname + baselen, de->d_name, len+1);
325
- if (excluded(dir, fullname) != dir->show_ignored) {
326
- if (!dir->show_ignored || DTYPE(de) != DT_DIR) {
327
- continue;
328
- }
329
- }
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;
334
335
switch (DTYPE(de)) {
336
struct stat st;
@@ -364,7 +368,8 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co
368
if (check_only)
369
goto exit_early;
370
else
367
- add_name(dir, fullname, baselen + len);
371
+ add_name(dir, fullname, baselen + len,
372
+ ignored_entry);
373
}
374
exit_early:
375
closedir(fdir);
dir.h
+4
-2
@@ -13,7 +13,8 @@
13
14
15
struct dir_entry {
16
- int len;
16
+ unsigned ignored_entry : 1;
17
+ unsigned int len : 15;
18
char name[FLEX_ARRAY]; /* more */
19
};
20
@@ -29,7 +30,8 @@ struct exclude_list {
30
31
struct dir_struct {
32
int nr, alloc;
32
- unsigned int show_ignored:1,
33
+ unsigned int show_both: 1,
34
+ show_ignored:1,
35
show_other_directories:1,
36
hide_empty_directories:1;
37
struct dir_entry **entries;