mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 09:45:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wild matching the drive letter.

Browse Source 
Support only "?:" or "*:", not e.g. "[CD]:".
This commit is contained in:
Nodir Temirkhodjaev 2020-01-15 14:06:48 +05:00
parent 7b411f3c9d
commit 8bcc95872a
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tests/confutil/test.cpp
View File

@ -40,7 +40,7 @@ void Test::confWriteRead()
);
appGroup1->setAllowText(
"C:\\Program Files\\Skype\\Phone\\Skype.exe\n"
"C:\\Utils\\Dev\\Git\\**\n"
"?:\\Utils\\Dev\\Git\\**\n"
"D:\\**\\Programs\\**\n"
);
@ -80,7 +80,10 @@ void Test::confWriteRead()
data, FileUtil::pathToKernelPath("C:\\Program Files\\Skype\\Phone\\Skype.exe"))));
QVERIFY(!FortCommon::confAppBlocked(
data, FortCommon::confAppFind(
data, FileUtil::pathToKernelPath("C:\\Utils\\Dev\\Git\\**"))));
data, FileUtil::pathToKernelPath("C:\\Utils\\Dev\\Git\\git.exe"))));
QVERIFY(!FortCommon::confAppBlocked(
data, FortCommon::confAppFind(
data, FileUtil::pathToKernelPath("D:\\Utils\\Dev\\Git\\bin\\git.exe"))));
QVERIFY(!FortCommon::confAppBlocked(
data, FortCommon::confAppFind(
data, FileUtil::pathToKernelPath("D:\\My\\Programs\\Test.exe"))));

23
src/ui/util/fileutil.cpp
View File

@ -67,14 +67,21 @@ QString FileUtil::kernelPathToPath(const QString &kernelPath)
QString FileUtil::pathToKernelPath(const QString &path, bool lower)
{
QString kernelPath = path;
if (path.size() > 1 && path.at(0).isLetter()) {
if (path.at(1) == QLatin1Char(':')) {
const QString drive = path.left(2);
kernelPath = driveToKernelName(drive)
+ path.mid(2).replace(QLatin1Char('/'), QLatin1Char('\\'));
} else {
if (QString::compare(path, systemPath, Qt::CaseInsensitive) == 0)
return systemPath;
if (path.size() > 1) {
const auto char1 = path.at(0);
if (char1.isLetter()) {
if (path.at(1) == ':') {
const QString drive = path.left(2);
kernelPath = driveToKernelName(drive)
+ path.mid(2).replace(QLatin1Char('/'), QLatin1Char('\\'));
} else {
if (QString::compare(path, systemPath, Qt::CaseInsensitive) == 0)
return systemPath;
}
} else if ((char1 == '?' || char1 == '*')
&& path.at(1) == ':') {
// Replace "?:\\" with "\\Device\\*\\"
kernelPath = "\\Device\\*" + path.mid(2);
}
}
return lower ? kernelPath.toLower() : kernelPath;