ShockVPN/wireguard-apple
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Zip importing: Handle spaces in filenames correctly

Browse Source 
Previously, if a filename of a .conf file inside the zip file
contained spaces, it was not imported.

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander
2018-12-12 16:57:17 +05:30
parent 034a1a12f7
commit 8259145f85
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WireGuard/WireGuard/ZipArchive/ZipArchive.swift
+7 -6
View File
@@ -39,9 +39,9 @@ class ZipArchive {
zipClose(zipFile, nil)
}
static func unarchive(url: URL, requiredFileExtensions: [String]) throws -> [(fileName: String, contents: Data)] {
static func unarchive(url: URL, requiredFileExtensions: [String]) throws -> [(fileBaseName: String, contents: Data)] {
var results: [(fileName: String, contents: Data)] = []
var results: [(fileBaseName: String, contents: Data)] = []
guard let zipFile = unzOpen64(url.path) else {
throw ZipArchiveError.cantOpenInputZipFile
@@ -72,10 +72,11 @@ class ZipArchive {
throw ZipArchiveError.badArchive
}
if let fileURL = URL(string: String(cString: fileNameBuffer)),
!fileURL.hasDirectoryPath,
requiredFileExtensions.contains(fileURL.pathExtension) {
let lastChar = String(cString: fileNameBuffer).suffix(1)
let isDirectory = (lastChar == "/" || lastChar == "\\")
let fileURL = URL(fileURLWithFileSystemRepresentation: fileNameBuffer, isDirectory: isDirectory, relativeTo: nil)
if (!isDirectory && requiredFileExtensions.contains(fileURL.pathExtension)) {
var unzippedData = Data()
var bytesRead: Int32 = 0
repeat {
@@ -88,7 +89,7 @@ class ZipArchive {
unzippedData.append(dataRead)
}
} while (bytesRead > 0)
results.append((fileName: fileURL.lastPathComponent, contents: unzippedData))
results.append((fileBaseName: fileURL.deletingPathExtension().lastPathComponent, contents: unzippedData))
}
guard (unzCloseCurrentFile(zipFile) == UNZ_OK) else {