Improve reading of strings with unknown lengths.

p-x9 · Jun 3, 2024 · cd9d698 · cd9d698
1 parent 41f0bb3
commit cd9d698
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/Sources/MachOKit/Extension/FileHandle+.swift b/Sources/MachOKit/Extension/FileHandle+.swift
@@ -158,6 +158,23 @@ extension FileHandle {
         return String(cString: data)
     }
 
+    @_spi(Support)
+    public func readString(
+        offset: UInt64,
+        step: UInt64 = 10
+    ) -> String? {
+        var data = Data()
+        var offset = offset
+        while true {
+            let new = readData(offset: offset, size: Int(step))
+            if new.contains(0) || new.isEmpty { break }
+            data.append(new)
+            offset += UInt64(new.count)
+        }
+
+        return String(cString: data)
+    }
+
     @_spi(Support)
     public func readData(
         offset: UInt64,

diff --git a/Sources/MachOKit/Model/DyldCache/DyldCacheImageInfo.swift b/Sources/MachOKit/Model/DyldCache/DyldCacheImageInfo.swift
@@ -20,8 +20,7 @@ extension DyldCacheImageInfo {
     /// - Returns: Path for image
     public func path(in cache: DyldCache) -> String? {
         cache.fileHandle.readString(
-            offset: numericCast(layout.pathFileOffset),
-            size: 1000 // FIXME
+            offset: numericCast(layout.pathFileOffset)
         )
     }
 }
diff --git a/Sources/MachOKit/Model/DyldCache/DyldCacheImageTextInfo.swift b/Sources/MachOKit/Model/DyldCache/DyldCacheImageTextInfo.swift
@@ -25,8 +25,7 @@ extension DyldCacheImageTextInfo {
     /// - Returns: Path for image text
     public func path(in cache: DyldCache) -> String? {
         cache.fileHandle.readString(
-            offset: numericCast(layout.pathOffset),
-            size: 1000 // FIXME
+            offset: numericCast(layout.pathOffset)
         )
     }
 }