Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-07-22 22:40:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Substitute tilde with USERPROFILE on Windows

Browse source 
The substitution is now more shell-like and tilde is only replaced
from the beginning of the path if it is trailed by a slash.
This commit is contained in:
Toni Spets 2020-07-17 19:36:24 +03:00 • committed by Jonathan White
parent 005d9d368f
commit 7c39907251
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/Tools.cpp
View file

@ -331,11 +331,15 @@ namespace Tools
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
QRegularExpression varRe("\\%([A-Za-z][A-Za-z0-9_]*)\\%"); QRegularExpression varRe("\\%([A-Za-z][A-Za-z0-9_]*)\\%");
QString homeEnv = "USERPROFILE";
#else #else
QRegularExpression varRe("\\$([A-Za-z][A-Za-z0-9_]*)"); QRegularExpression varRe("\\$([A-Za-z][A-Za-z0-9_]*)");
subbed.replace("~", environment.value("HOME")); QString homeEnv = "HOME";
#endif #endif
if (subbed.startsWith("~/") || subbed.startsWith("~\\"))
subbed.replace(0, 1, environment.value(homeEnv));
QRegularExpressionMatch match; QRegularExpressionMatch match;
do { do {

4
tests/TestTools.cpp
View file

@ -72,10 +72,14 @@ void TestTools::testEnvSubstitute()
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
environment.insert("HOMEDRIVE", "C:"); environment.insert("HOMEDRIVE", "C:");
environment.insert("HOMEPATH", "\\Users\\User"); environment.insert("HOMEPATH", "\\Users\\User");
environment.insert("USERPROFILE", "C:\\Users\\User");
QCOMPARE(Tools::envSubstitute("%HOMEDRIVE%%HOMEPATH%\\.ssh\\id_rsa", environment), QCOMPARE(Tools::envSubstitute("%HOMEDRIVE%%HOMEPATH%\\.ssh\\id_rsa", environment),
QString("C:\\Users\\User\\.ssh\\id_rsa")); QString("C:\\Users\\User\\.ssh\\id_rsa"));
QCOMPARE(Tools::envSubstitute("start%EMPTY%%EMPTY%%%HOMEDRIVE%%end", environment), QString("start%C:%end")); QCOMPARE(Tools::envSubstitute("start%EMPTY%%EMPTY%%%HOMEDRIVE%%end", environment), QString("start%C:%end"));
QCOMPARE(Tools::envSubstitute("%USERPROFILE%\\.ssh\\id_rsa", environment),
QString("C:\\Users\\User\\.ssh\\id_rsa"));
QCOMPARE(Tools::envSubstitute("~\\.ssh\\id_rsa", environment), QString("C:\\Users\\User\\.ssh\\id_rsa"));
#else #else
environment.insert("HOME", QString("/home/user")); environment.insert("HOME", QString("/home/user"));
environment.insert("USER", QString("user")); environment.insert("USER", QString("user"));