emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

du: don't count duplicate arguments. Closes 5288

Browse Source 
Since coreutils 8.6 (2010-10-15) du no longer counts duplicate arguments.

Revert the relevant part of commit 618a3027ed (du: fix "du /dir /dir"
case).

function                                             old     new   delta
du_main                                              302     297      -5
reset_ino_dev_hashtable                               78       -     -78
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 0/1 up/down: 0/-83)             Total: -83 bytes

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Ron Yorston 2019-02-16 10:22:31 +00:00 committed by Denys Vlasenko
parent 8502fa8747
commit e563f9e851
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coreutils/du.c
View File

@ -290,11 +290,11 @@ int du_main(int argc UNUSED_PARAM, char **argv)
total = 0; total = 0;
do { do {
total += du(*argv); total += du(*argv);
/* otherwise du /dir /dir won't show /dir twice: */
reset_ino_dev_hashtable();
G.slink_depth = slink_depth_save; G.slink_depth = slink_depth_save;
} while (*++argv); } while (*++argv);
if (ENABLE_FEATURE_CLEAN_UP)
reset_ino_dev_hashtable();
if (opt & OPT_c_total) if (opt & OPT_c_total)
print(total, "total"); print(total, "total");

2
libbb/inode_hash.c
View File

@ -77,7 +77,7 @@ void FAST_FUNC add_to_ino_dev_hashtable(const struct stat *statbuf, const char *
ino_dev_hashtable[i] = bucket; ino_dev_hashtable[i] = bucket;
} }
#if ENABLE_DU || ENABLE_FEATURE_CLEAN_UP #if ENABLE_FEATURE_CLEAN_UP
/* Clear statbuf hash table */ /* Clear statbuf hash table */
void FAST_FUNC reset_ino_dev_hashtable(void) void FAST_FUNC reset_ino_dev_hashtable(void)
{ {