passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Zip archive: Handle files within folders inside the zip

This commit is contained in:
Roopesh Chander 2018-11-03 15:37:31 +05:30
parent 911e7156b3
commit eb122f87e2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
WireGuard/WireGuard/ZipArchive/ZipArchive.swift
View File

@ -61,10 +61,10 @@ class ZipArchive {
throw ZipArchiveError.badArchive throw ZipArchiveError.badArchive
} }
let fileName = String(cString: fileNameBuffer) if let fileURL = URL(string: String(cString: fileNameBuffer)),
let fileExtension = URL(string: fileName)?.pathExtension ?? "" !fileURL.hasDirectoryPath,
requiredFileExtensions.contains(fileURL.pathExtension) {
if (requiredFileExtensions.contains(fileExtension)) {
var unzippedData = Data() var unzippedData = Data()
var bytesRead: Int32 = 0 var bytesRead: Int32 = 0
repeat { repeat {
@ -77,7 +77,7 @@ class ZipArchive {
unzippedData.append(dataRead) unzippedData.append(dataRead)
} }
} while (bytesRead > 0) } while (bytesRead > 0)
results.append((fileName: fileName, contents: unzippedData)) results.append((fileName: fileURL.lastPathComponent, contents: unzippedData))
} }
guard (unzCloseCurrentFile(zipFile) == UNZ_OK) else { guard (unzCloseCurrentFile(zipFile) == UNZ_OK) else {