diff options
| -rw-r--r-- | src/imitatepass.cpp | 2 | ||||
| -rw-r--r-- | src/pass.cpp | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/imitatepass.cpp b/src/imitatepass.cpp index c6492813..307670de 100644 --- a/src/imitatepass.cpp +++ b/src/imitatepass.cpp @@ -286,7 +286,7 @@ bool ImitatePass::verifyGpgIdFile(const QString &file) { QStringList{"--verify", "--status-fd=1", pgpg(file) + ".sig", pgpg(file)}; exec.executeBlocking(QtPassSettings::getGpgExecutable(), args, &out); QRegularExpression re( - "^\\[GNUPG:\\] VALIDSIG ([A-F0-9]{40}) .* ([A-F0-9]{40})$", + "^\\[GNUPG:\\] VALIDSIG ([A-F0-9]{40}) .* ([A-F0-9]{40})\\r?$", QRegularExpression::MultilineOption); QRegularExpressionMatch m = re.match(out); if (!m.hasMatch()) diff --git a/src/pass.cpp b/src/pass.cpp index 4547ba9c..fdc8fdc9 100644 --- a/src/pass.cpp +++ b/src/pass.cpp @@ -284,13 +284,15 @@ void Pass::updateEnv() { * @return path to the gpgid file. */ QString Pass::getGpgIdPath(QString for_file) { - QDir gpgIdDir(QFileInfo(for_file.startsWith(QtPassSettings::getPassStore()) - ? for_file - : QtPassSettings::getPassStore() + for_file) - .absoluteDir()); + QString passStore = + QDir::fromNativeSeparators(QtPassSettings::getPassStore()); + QDir gpgIdDir( + QFileInfo(QDir::fromNativeSeparators(for_file).startsWith(passStore) + ? for_file + : QtPassSettings::getPassStore() + for_file) + .absoluteDir()); bool found = false; - while (gpgIdDir.exists() && - gpgIdDir.absolutePath().startsWith(QtPassSettings::getPassStore())) { + while (gpgIdDir.exists() && gpgIdDir.absolutePath().startsWith(passStore)) { if (QFile(gpgIdDir.absoluteFilePath(".gpg-id")).exists()) { found = true; break; |