nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 08:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrapper code for zlib to recognize directories

Browse Source 
encoded as files of size=0 with names ending in "/"
Fixes #4189
This commit is contained in:
Alejandro Martinez
2022-07-28 15:48:39 -03:00
parent c560f80245
commit 73e2e0709b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/qzip/zip.cpp
View File

@@ -430,6 +430,10 @@ void QZipPrivate::fillFileInfo(int index, ZipReader::FileInfo &fileInfo) const
fileInfo.crc_32 = readUInt(header.h.crc_32);
fileInfo.size = readUInt(header.h.uncompressed_size);
fileInfo.lastModified = readMSDosDate(header.h.last_mod_file);
// Files of size 0 ending in "/" seems to be an alternative directory encoding used by some compressors
bool altIsDir = (fileInfo.size == 0 && fileInfo.filePath.endsWith("/"));
fileInfo.isDir = fileInfo.isDir || altIsDir;
fileInfo.isFile = fileInfo.isFile && !altIsDir;
}
class ZipReaderPrivate : public QZipPrivate
@@ -930,7 +934,7 @@ bool ZipReader::extractAll(const QString &destinationDir) const
if (fi.isDir) {
if (!baseDir.mkpath(fi.filePath))
return false;
if (!QFile::setPermissions(absPath, fi.permissions))
if (fi.permissions > 0 && !QFile::setPermissions(absPath, fi.permissions))
return false;
}
}