GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt: Use UTF-8 for file names on Windows

Browse Source 
* lang/qt/src/qgpgmedecryptverifyarchivejob.cpp
(decrypt_verify_from_file_name): On Windows, convert Unicode file name
to UTF-8.
* lang/qt/src/qgpgmeencryptarchivejob.cpp (encrypt,
encrypt_to_filename): On Windows, convert Unicode file name from/to
UTF-8.
* lang/qt/src/qgpgmesignarchivejob.cpp (sign, sign_to_filename): Ditto.
* lang/qt/src/qgpgmesignencryptarchivejob.cpp (sign_encrypt,
sign_encrypt_to_filename): Ditto.
--

On Windows, GnuPG expects file names to be UTF-8-encoded. This fixes
encrypting and decrypting folders with umlauts in the folder name and
in the file name of the archive. Encrypting and decrypting folders
with kanji still fails.

GnuPG-bug-id: 6728
This commit is contained in:
Ingo Klöcker 2023-09-22 09:14:34 +02:00
parent 4e321a0f06
commit d43d787e9a
No known key found for this signature in database
GPG Key ID: F5A5D1692277A1E9
4 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/qt/src/qgpgmedecryptverifyarchivejob.cpp
View File

@ -122,7 +122,11 @@ static QGpgMEDecryptVerifyArchiveJob::result_type decrypt_verify_from_file_name(
const QString &outputDirectory) const QString &outputDirectory)
{ {
Data indata; Data indata;
#ifdef Q_OS_WIN
indata.setFileName(inputFile.toUtf8().constData());
#else
indata.setFileName(QFile::encodeName(inputFile).constData()); indata.setFileName(QFile::encodeName(inputFile).constData());
#endif
return decrypt_verify(ctx, indata, outputDirectory); return decrypt_verify(ctx, indata, outputDirectory);
} }

8
lang/qt/src/qgpgmeencryptarchivejob.cpp
View File

@ -104,7 +104,11 @@ static QGpgMEEncryptArchiveJob::result_type encrypt(Context *ctx,
flags = static_cast<Context::EncryptionFlags>(flags | Context::EncryptArchive); flags = static_cast<Context::EncryptionFlags>(flags | Context::EncryptArchive);
const auto encryptionResult = ctx->encrypt(recipients, indata, outdata, flags); const auto encryptionResult = ctx->encrypt(recipients, indata, outdata, flags);
#ifdef Q_OS_WIN
const auto outputFileName = QString::fromUtf8(outdata.fileName());
#else
const auto outputFileName = QFile::decodeName(outdata.fileName()); const auto outputFileName = QFile::decodeName(outdata.fileName());
#endif
if (!outputFileName.isEmpty() && encryptionResult.error().code()) { if (!outputFileName.isEmpty() && encryptionResult.error().code()) {
// ensure that the output file is removed if the operation was canceled or failed // ensure that the output file is removed if the operation was canceled or failed
if (QFile::exists(outputFileName)) { if (QFile::exists(outputFileName)) {
@ -143,7 +147,11 @@ static QGpgMEEncryptArchiveJob::result_type encrypt_to_filename(Context *ctx,
const QString &baseDirectory) const QString &baseDirectory)
{ {
Data outdata; Data outdata;
#ifdef Q_OS_WIN
outdata.setFileName(outputFile.toUtf8().constData());
#else
outdata.setFileName(QFile::encodeName(outputFile).constData()); outdata.setFileName(QFile::encodeName(outputFile).constData());
#endif
return encrypt(ctx, recipients, paths, outdata, flags, baseDirectory); return encrypt(ctx, recipients, paths, outdata, flags, baseDirectory);
} }

8
lang/qt/src/qgpgmesignarchivejob.cpp
View File

@ -111,7 +111,11 @@ static QGpgMESignArchiveJob::result_type sign(Context *ctx,
const auto signingResult = ctx->sign(indata, outdata, GpgME::SignArchive); const auto signingResult = ctx->sign(indata, outdata, GpgME::SignArchive);
#ifdef Q_OS_WIN
const auto outputFileName = QString::fromUtf8(outdata.fileName());
#else
const auto outputFileName = QFile::decodeName(outdata.fileName()); const auto outputFileName = QFile::decodeName(outdata.fileName());
#endif
if (!outputFileName.isEmpty() && signingResult.error().code()) { if (!outputFileName.isEmpty() && signingResult.error().code()) {
// ensure that the output file is removed if the operation was canceled or failed // ensure that the output file is removed if the operation was canceled or failed
if (QFile::exists(outputFileName)) { if (QFile::exists(outputFileName)) {
@ -148,7 +152,11 @@ static QGpgMESignArchiveJob::result_type sign_to_filename(Context *ctx,
const QString &baseDirectory) const QString &baseDirectory)
{ {
Data outdata; Data outdata;
#ifdef Q_OS_WIN
outdata.setFileName(outputFile.toUtf8().constData());
#else
outdata.setFileName(QFile::encodeName(outputFile).constData()); outdata.setFileName(QFile::encodeName(outputFile).constData());
#endif
return sign(ctx, signers, paths, outdata, baseDirectory); return sign(ctx, signers, paths, outdata, baseDirectory);
} }

8
lang/qt/src/qgpgmesignencryptarchivejob.cpp
View File

@ -116,7 +116,11 @@ static QGpgMESignEncryptArchiveJob::result_type sign_encrypt(Context *ctx,
const auto &signingResult = res.first; const auto &signingResult = res.first;
const auto &encryptionResult = res.second; const auto &encryptionResult = res.second;
#ifdef Q_OS_WIN
const auto outputFileName = QString::fromUtf8(outdata.fileName());
#else
const auto outputFileName = QFile::decodeName(outdata.fileName()); const auto outputFileName = QFile::decodeName(outdata.fileName());
#endif
if (!outputFileName.isEmpty() && (signingResult.error().code() || encryptionResult.error().code())) { if (!outputFileName.isEmpty() && (signingResult.error().code() || encryptionResult.error().code())) {
// ensure that the output file is removed if the operation was canceled or failed // ensure that the output file is removed if the operation was canceled or failed
if (QFile::exists(outputFileName)) { if (QFile::exists(outputFileName)) {
@ -157,7 +161,11 @@ static QGpgMESignEncryptArchiveJob::result_type sign_encrypt_to_filename(Context
const QString &baseDirectory) const QString &baseDirectory)
{ {
Data outdata; Data outdata;
#ifdef Q_OS_WIN
outdata.setFileName(outputFile.toUtf8().constData());
#else
outdata.setFileName(QFile::encodeName(outputFile).constData()); outdata.setFileName(QFile::encodeName(outputFile).constData());
#endif
return sign_encrypt(ctx, signers, recipients, paths, outdata, encryptionFlags, baseDirectory); return sign_encrypt(ctx, signers, recipients, paths, outdata, encryptionFlags, baseDirectory);
} }