PublicArchive/gnu-coreutils
2
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils synced 2026-06-09 17:13:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

(process_file): Don't return early for excluded files

Browse Source 
or for files whose dev/inode we've already seen.
This commit is contained in:
Jim Meyering
2003-02-06 08:14:01 +00:00
parent 505f652d9e
commit a47615d2ed
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/du.c
+19 -7
View File
@@ -359,16 +359,28 @@ process_file (const char *file, const struct stat *sb, int file_type,
break;
}
if (!opt_count_all
&& 1 < sb->st_nlink
&& hash_ins (sb->st_ino, sb->st_dev))
return 0; /* Have counted this already. */
/* If the file is being excluded or if it has already been counted
via a hard link, then don't let it contribute to the sums. */
if ((info->skip = excluded_filename (exclude, file + info->base))
|| (!opt_count_all
&& 1 < sb->st_nlink
&& hash_ins (sb->st_ino, sb->st_dev)))
{
/* Note that we must not simply return here.
We still have to update prev_level and maybe propagate
some sums up the hierarchy. */
s = size = 0;
}
else
{
s = size = ST_NBLOCKS (*sb);
}
if (excluded_filename (exclude, file + info->base))
/* If this is the first (pre-order) encounter with a directory,
return right away. */
if (file_type == FTW_DPRE)
return 0;
s = size = ST_NBLOCKS (*sb);
if (first_call)
{
n_alloc = info->level + 10;