StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

findleaves.py: prevent recursion into symlink loops

Browse Source 
Keep a set of all visited inodes, and prevent recursing into a symlink
to an already visited inode.

Test: m -j
Test: compare `build/tools/findleaves.py --prune=.repo --prune=.git --mindepth=2 --dir=. Android.mk` before and after
Change-Id: Ied14c40d3066ef9f8e8a2b1535f56f7bbbbd0ab6
This commit is contained in:
Colin Cross
2016-11-03 13:51:10 -07:00
parent d778640b0f
commit 7829ebfebd
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/findleaves.py
View File

@@ -26,6 +26,7 @@ import sys
def perform_find(mindepth, prune, dirlist, filenames): def perform_find(mindepth, prune, dirlist, filenames):
result = [] result = []
pruneleaves = set(map(lambda x: os.path.split(x)[1], prune)) pruneleaves = set(map(lambda x: os.path.split(x)[1], prune))
seen = set()
for rootdir in dirlist: for rootdir in dirlist:
rootdepth = rootdir.count("/") rootdepth = rootdir.count("/")
for root, dirs, files in os.walk(rootdir, followlinks=True): for root, dirs, files in os.walk(rootdir, followlinks=True):
@@ -52,6 +53,18 @@ def perform_find(mindepth, prune, dirlist, filenames):
if filename in files: if filename in files:
result.append(os.path.join(root, filename)) result.append(os.path.join(root, filename))
del dirs[:] del dirs[:]
# filter out inodes that have already been seen due to symlink loops
i = 0
while i < len(dirs):
st = os.stat(os.path.join(root, dirs[i]))
key = (st.st_dev, st.st_ino)
if key in seen:
del dirs[i]
else:
i += 1
seen.add(key)
return result return result
def usage(): def usage():