mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-05 22:20:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make listFilesRecursively() faster by removing an lstat call for most directory items

Browse Source
This commit is contained in:
Greg Neagle
2025-06-09 21:59:42 -07:00
parent 00ca0dfcb0
commit 29dc02747e
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
code/cli/munki/shared/utils/fileutils.swift
View File

@@ -247,27 +247,32 @@ func listFilesRecursively(_ top: String, followLinks: Bool = true, skipDotFiles:
let ptr = rawPtr.baseAddress!.assumingMemoryBound(to: CChar.self)
return String(cString: ptr, encoding: .utf8)
}
// avoids a stat call for most directory entries
let entryType = dir_entry.pointee.d_type
guard let entryName else { continue }
guard entryName != "." else { continue }
guard entryName != ".." else { continue }
if skipDotFiles, entryName.hasPrefix(".") {
continue
}
let itemPath = (top as NSString).appendingPathComponent(entryName)
let sb = UnsafeMutablePointer<stat>.allocate(capacity: 1)
if followLinks {
// if a symlink, return data for what it points to
stat(itemPath, sb)
} else {
// return data for the link itself
lstat(itemPath, sb)
}
let isDir = sb.pointee.st_mode & S_IFDIR == S_IFDIR
sb.deallocate()
if isDir {
if entryType == DT_DIR {
// it's a directory
dirs.append(entryName)
continue
}
if entryType == DT_LNK, followLinks {
// need to find out what the type is of the item that is the
// symlink's target
let itemPath = (top as NSString).appendingPathComponent(entryName)
let sb = UnsafeMutablePointer<stat>.allocate(capacity: 1)
stat(itemPath, sb)
let isDir = sb.pointee.st_mode & S_IFDIR == S_IFDIR
sb.deallocate()
if isDir {
dirs.append(entryName)
continue
}
}
paths.append(entryName)
}
closedir(dirp)