ihateninjas/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher synced 2026-04-23 09:05:03 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

load the path name with local8Bit if not utf

Browse source 
extended to the symlinks stuff so I geneeralized the function:
- if I can get the utf8(the best outcome) I will use fromUtf8
- if not I will fall back to normal funciton and decode it with
fromLocal8Bit

This convention applies to:
- archive_entry_pathname
- archive_entry_symlink
- archive_entry_hardlink

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2026-03-17 09:12:27 +02:00
parent 3f97d65224
commit 441fb4a891
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
launcher/archive/ArchiveReader.cpp
View file

@ -24,6 +24,7 @@
#include <QDir>
#include <QFileInfo>
#include <QUrl>
#include <functional>
#include <memory>
#include <optional>
@ -43,15 +44,21 @@ bool ArchiveReader::collectFiles(bool onlyFiles)
});
}
QString ArchiveReader::File::filename()
using getPathFunc = std::function<const char*(archive_entry*)>;
static QString decodeLibArchivePath(archive_entry* entry, const getPathFunc& getUtf8Path, const getPathFunc& getPath)
{
auto fileName = QString::fromUtf8(archive_entry_pathname_utf8(m_entry));
auto fileName = QString::fromUtf8(getUtf8Path(entry));
if (fileName.isEmpty()) {
fileName = QString::fromUtf8(archive_entry_pathname(m_entry));
fileName = QString::fromLocal8Bit(getPath(entry));
}
return fileName;
}
QString ArchiveReader::File::filename()
{
return decodeLibArchivePath(m_entry, archive_entry_pathname_utf8, archive_entry_pathname);
}
QByteArray ArchiveReader::File::readAll(int* outStatus)
{
QByteArray data;
@ -136,18 +143,20 @@ static int copy_data(struct archive* ar, struct archive* aw, bool notBlock = fal
}
}
bool willEscapeRoot(const QDir& root, archive_entry* entry)
static bool willEscapeRoot(const QDir& root, archive_entry* entry)
{
const char* entryPathC = archive_entry_pathname(entry);
const char* linkTargetC = archive_entry_symlink(entry);
const char* hardlinkC = archive_entry_hardlink(entry);
auto entryPath = decodeLibArchivePath(entry, archive_entry_pathname_utf8, archive_entry_pathname);
auto linkTarget = decodeLibArchivePath(entry, archive_entry_symlink_utf8, archive_entry_symlink);
auto hardLink = decodeLibArchivePath(entry, archive_entry_hardlink_utf8, archive_entry_hardlink);
if (!entryPathC || (!linkTargetC && !hardlinkC)) {
if (entryPath.isEmpty() || (linkTarget.isEmpty() && hardLink.isEmpty())) {
return false;
}
QString entryPath = QString::fromUtf8(entryPathC);
QString linkTarget = linkTargetC ? QString::fromUtf8(linkTargetC) : QString::fromUtf8(hardlinkC);
bool isHardLink = false;
if (isHardLink = linkTarget.isEmpty(); isHardLink) {
linkTarget = hardLink;
}
QString linkFullPath = root.filePath(entryPath);
auto rootDir = QUrl::fromLocalFile(root.absolutePath());
@ -158,7 +167,7 @@ bool willEscapeRoot(const QDir& root, archive_entry* entry)
QDir linkDir = QFileInfo(linkFullPath).dir();
if (!QDir::isAbsolutePath(linkTarget)) {
linkTarget = (linkTargetC ? linkDir : root).filePath(linkTarget);
linkTarget = (!isHardLink ? linkDir : root).filePath(linkTarget);
}
return !rootDir.isParentOf(QUrl::fromLocalFile(QDir::cleanPath(linkTarget)));
}