Skip to content

update unxip to the latest version #209

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
MattKiazyk merged 1 commit into from
Sep 17, 2022
Merged

update unxip to the latest version #209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions Sources/Unxip/Unxip.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,9 @@ struct File {
compressionStream.addTask {
try Task.checkCancellation()
let position = _position
let data = [UInt8](unsafeUninitializedCapacity: blockSize + blockSize / 16) { buffer, count in
data[position..<min(position + blockSize, data.endIndex)].withUnsafeBufferPointer { data in
let end = min(position + blockSize, data.endIndex)
let data = [UInt8](unsafeUninitializedCapacity: (end - position) + (end - position) / 16) { buffer, count in
data[position..<end].withUnsafeBufferPointer { data in
count = compression_encode_buffer(buffer.baseAddress!, buffer.count, data.baseAddress!, data.count, nil, COMPRESSION_LZFSE)
guard count < buffer.count else {
count = 0
Expand Down Expand Up @@ -365,7 +366,7 @@ public struct Unxip {

// The assumption is that all directories are provided without trailing slashes
func parentDirectory<S: StringProtocol>(of path: S) -> S.SubSequence {
return path[..<path.lastIndex(of: "/")!]
path[..<path.lastIndex(of: "/")!]
}

// https://bugs.swift.org/browse/SR-15816
Expand All @@ -384,9 +385,11 @@ public struct Unxip {
continue
}

if let (original, task) = hardlinks[file.identifier] {
if let (original, originalTask) = hardlinks[file.identifier] {
let task = parentDirectoryTask(for: file)
assert(task != nil, file.name)
_ = taskStream.addRunningTask {
await task.value
_ = await (originalTask.value, task?.value)
warn(link(original, file.name), "linking")
}
continue
Expand All @@ -399,6 +402,7 @@ public struct Unxip {
let task = parentDirectoryTask(for: file)
assert(task != nil, file.name)
_ = taskStream.addRunningTask {
await task?.value
warn(symlink(String(data: Data(file.data.map(Array.init).reduce([], +)), encoding: .utf8), file.name), "symlinking")
setStickyBit(on: file)
}
Expand Down