PWN-Hunter/android_external_toybox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ashwini Sharma pointed out that "mkdir sub; ln -s . sub/up; du -L sub" shouldn't loop endlessly.

Browse Source
This commit is contained in:
Rob Landley 2014-12-01 12:52:55 -06:00
parent ef6a773198
commit 10e0d86c08
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/du.test
View File

@ -18,6 +18,9 @@ ln -s ../du_2 du_test/xyz
# allocated file space is zero.
testing "du counts symlinks without following" "du -ks du_test" "8\tdu_test\n" "" ""
testing "du -L follows symlinks" "du -ksL du_test" "16\tdu_test\n" "" ""
ln -s . du_test/up
testing "du -L avoid endless loop" "du -ksL du_test" "16\tdu_test\n" "" ""
rm du_test/up
# if -H and -L are specified, the last takes priority
testing "du -HL follows symlinks" "du -ksHL du_test" "16\tdu_test\n" "" ""
testing "du -H does not follow unspecified symlinks" "du -ksH du_test" "8\tdu_test\n" "" ""

9
toys/posix/du.c
View File

@ -110,6 +110,15 @@ static int do_du(struct dirtree *node)
if ((toys.optflags & FLAG_x) && (TT.st_dev != node->st.st_dev))
return 0;
// Don't loop endlessly on recursive directory symlink
if (toys.optflags & FLAG_L) {
struct dirtree *try = node;
while ((try = try->parent))
if (node->st.st_dev==try->st.st_dev && node->st.st_ino==try->st.st_ino)
return 0;
}
// Don't count hard links twice
if (!(toys.optflags & FLAG_l) && !node->again)
if (seen_inode(&TT.inodes, &node->st)) return 0;