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

New listFilesRecursively function needs to handle filenames with non-ASCII chars

Browse Source
This commit is contained in:
Greg Neagle
2025-06-08 20:57:30 -07:00
parent 84ba6fa5ff
commit 40864980e6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,10 +242,11 @@ func listFilesRecursively(_ top: String, followLinks: Bool = true, skipDotFiles:
var paths = [String]()
guard let dirp = opendir(top) else { return [] }
while let dir_entry = readdir(dirp) {
let entryName = withUnsafeBytes(of: dir_entry.pointee.d_name) { rawPtr -> String in
let entryName = withUnsafeBytes(of: dir_entry.pointee.d_name) { rawPtr -> String? in
let ptr = rawPtr.baseAddress!.assumingMemoryBound(to: CChar.self)
return String(cString: ptr)
return String(cString: ptr, encoding: .utf8)
}
guard let entryName else { continue }
guard entryName != "." else { continue }
guard entryName != ".." else { continue }
if skipDotFiles, entryName.hasPrefix(".") {