Skip to content

EXT4: Fix the construction of the path#666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wlan0 merged 6 commits into from
Apr 9, 2026
Merged

EXT4: Fix the construction of the path #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
527a3aa
Add a test for paths under the absolute root
dkovba Apr 8, 2026
80a794f
Add a test for paths under the relative root
dkovba Apr 8, 2026
7185780
Add a test for a path under a named root
dkovba Apr 8, 2026
2a45298
Fix the path by reversing the order of the pushing operation
dkovba Apr 8, 2026
d9a6958
Remove the unnecessary handling of the last component
dkovba Apr 8, 2026
25ec59a
Remove the unnecessary round-trip conversions
dkovba Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions Sources/ContainerizationEXT4/EXT4+FileTree.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,21 +61,8 @@ extension EXT4 {
components.append(ptr.pointee.name)
_ptr = ptr.pointee.parent
}
guard let last = components.last else {
return nil
}
guard components.count > 1 else {
return FilePath(last)
}
components = components.dropLast()
let path = components.reversed().joined(separator: "/")
guard let data = path.data(using: .utf8) else {
return nil
}
guard let dataPath = String(data: data, encoding: .utf8) else {
return nil
}
return FilePath(dataPath).pushing(FilePath(last)).lexicallyNormalized()
return FilePath(path).lexicallyNormalized()
}
}

Expand Down
43 changes: 43 additions & 0 deletions Tests/ContainerizationEXT4Tests/TestEXT4Reader+IO.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -584,4 +584,47 @@ struct EXT4PathIOTests {
let all = try r.readFile(at: FilePath("/big/file.bin"))
#expect(all.count == bigSize)
}

@Test
func fileTreeNodePathWithAbsoluteRoot() {
let tree = EXT4.FileTree(EXT4.RootInode, "/")

let dirPtr = EXT4.Ptr<EXT4.FileTree.FileTreeNode>.allocate(capacity: 1)
dirPtr.initialize(to: EXT4.FileTree.FileTreeNode(inode: 3, name: "dir", parent: tree.root))
tree.root.pointee.children.append(dirPtr)

let filePtr = EXT4.Ptr<EXT4.FileTree.FileTreeNode>.allocate(capacity: 1)
filePtr.initialize(to: EXT4.FileTree.FileTreeNode(inode: 4, name: "file", parent: dirPtr))
dirPtr.pointee.children.append(filePtr)

#expect(dirPtr.pointee.path == FilePath("/dir"))
#expect(filePtr.pointee.path == FilePath("/dir/file"))
}

@Test
func fileTreeNodePathWithRelativeRoot() {
let tree = EXT4.FileTree(EXT4.RootInode, ".")

let dirPtr = EXT4.Ptr<EXT4.FileTree.FileTreeNode>.allocate(capacity: 1)
dirPtr.initialize(to: EXT4.FileTree.FileTreeNode(inode: 3, name: "dir", parent: tree.root))
tree.root.pointee.children.append(dirPtr)

let filePtr = EXT4.Ptr<EXT4.FileTree.FileTreeNode>.allocate(capacity: 1)
filePtr.initialize(to: EXT4.FileTree.FileTreeNode(inode: 4, name: "file", parent: dirPtr))
dirPtr.pointee.children.append(filePtr)

#expect(dirPtr.pointee.path == FilePath("dir"))
#expect(filePtr.pointee.path == FilePath("dir/file"))
}

@Test
func fileTreeNodePathWithNamedRoot() {
let tree = EXT4.FileTree(EXT4.RootInode, "dir")

let filePtr = EXT4.Ptr<EXT4.FileTree.FileTreeNode>.allocate(capacity: 1)
filePtr.initialize(to: EXT4.FileTree.FileTreeNode(inode: 3, name: "file", parent: tree.root))
tree.root.pointee.children.append(filePtr)

#expect(filePtr.pointee.path == FilePath("dir/file"))
}
}
Loading