Skip to content

Fix macOS .dylib symlink issue #67

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

Open
phu54321 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix macOS .dylib symlink issue #67

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
26 changes: 26 additions & 0 deletions src/archives/zipextractor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,27 @@ static inline QFile::Permissions getPermissionsFromUnix(quint16 type) {
return static_cast<QFile::Permissions>(((type & 0700) << 6) | ((type & 0700) << 2) | ((type & 0070) << 1) | (type & 0007));
}

static void handleSymlinkDylib(const QString& filename) {
if (filename.endsWith(".dylib")) {
QFile file(filename);
file.open(QFile::ReadOnly);
if (file.size() < 100) {
auto targetFilename = static_cast<QString>(file.readLine());
file.close();
file.remove();
QFile::link(targetFilename, filename);
} else {
file.close();
file.setPermissions(
file.permissions() |
QFileDevice::ExeOwner |
QFileDevice::ExeGroup |
QFileDevice::ExeOther
);
}
}
}

bool extractZip(QIODevice *in, QDir extractLoc) {
in->open(QIODevice::ReadOnly);
QDataStream stream(in);
Expand Down Expand Up @@ -78,6 +99,8 @@ bool extractZip(QIODevice *in, QDir extractLoc) {
}

file.close();

handleSymlinkDylib(extractLoc.filePath(name));
if (rcrc != crc) return false; // CRC-32 Mismatch

} else { // Standard DEFLATE
Expand Down Expand Up @@ -118,6 +141,9 @@ bool extractZip(QIODevice *in, QDir extractLoc) {
}

file.close();

handleSymlinkDylib(extractLoc.filePath(name));

ret ^= 1;
ret |= inflateEnd(&strm);
if (ret != Z_OK) return false;
Expand Down