Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 11:38:21 +02:00
Code Activity

Add willdcard check in BfpFindFileData_CheckFilter

Browse source
This commit is contained in:
disarray2077 2022-07-05 03:41:14 -03:00
parent 95bd231444
commit debcf7eb6c
12 changed files with 81 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
BeefySysLib/platform/posix/PosixCommon.cpp
View file

@ -22,6 +22,7 @@
#include "../../util/CritSect.h"
#include "../../util/Dictionary.h"
#include "../../util/Hash.h"
#include "../../third_party/putty/wildcard.h"
#ifdef BFP_HAS_EXECINFO
#include <execinfo.h>
#endif
@ -2378,9 +2379,10 @@ static bool BfpFindFileData_CheckFilter(BfpFindFileData* findData)
{
if ((findData->mFlags & BfpFindFileFlag_Files) == 0)
return false;
}
}
//TODO: Check actual wildcards.
if (!wc_match(findData->mWildcard.c_str(), findData->mDirEnt->d_name))
return false;
return true;
}

41
BeefySysLib/platform/win/Platform.cpp
View file

@ -25,6 +25,7 @@
#include "../util/CritSect.h"
#include "../util/Dictionary.h"
#include "../util/HashSet.h"
#include "../../third_party/putty/wildcard.h"
#include "util/AllocDebug.h"
@ -3485,6 +3486,7 @@ struct BfpFindFileData
{
BfpFindFileFlags mFlags;
WIN32_FIND_DATA mFindData;
Beefy::String mWildcard;
HANDLE mHandle;
};
@ -3496,29 +3498,43 @@ static bool BfpFindFileData_CheckFilter(BfpFindFileData* findData)
bool isDir = (findData->mFindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
if (isDir)
{
if ((findData->mFlags & BfpFindFileFlag_Directories) != 0)
{
if ((wcscmp(findData->mFindData.cFileName, L".") == 0) || (wcscmp(findData->mFindData.cFileName, L"..") == 0))
{
return false;
}
return true;
}
if ((findData->mFlags & BfpFindFileFlag_Directories) == 0)
return false;
if ((wcscmp(findData->mFindData.cFileName, L".") == 0) || (wcscmp(findData->mFindData.cFileName, L"..") == 0))
return false;
}
else
{
if ((findData->mFlags & BfpFindFileFlag_Files) != 0)
return true;
if ((findData->mFlags & BfpFindFileFlag_Files) == 0)
return false;
}
return false;
Beefy::String fileName = UTF8Encode(findData->mFindData.cFileName);
if (!wc_match(findData->mWildcard.c_str(), fileName.c_str()))
return false;
return true;
}
BFP_EXPORT BfpFindFileData* BFP_CALLTYPE BfpFindFileData_FindFirstFile(const char* path, BfpFindFileFlags flags, BfpFileResult* outResult)
{
UTF16String wPath = UTF8Decode(path);
Beefy::String findStr = path;
Beefy::String wildcard;
int lastSlashPos = std::max((int)findStr.LastIndexOf('/'), (int)findStr.LastIndexOf('\\'));
if (lastSlashPos != -1)
{
wildcard = findStr.Substring(lastSlashPos + 1);
findStr = findStr.Substring(0, lastSlashPos + 1);
findStr.Append("*");
}
if (wildcard == "*.*")
wildcard = "*";
BfpFindFileData* findData = new BfpFindFileData();
findData->mFlags = flags;
findData->mWildcard = wildcard;
FINDEX_SEARCH_OPS searchOps;
if ((flags & BfpFindFileFlag_Files) == 0)
@ -3526,6 +3542,7 @@ BFP_EXPORT BfpFindFileData* BFP_CALLTYPE BfpFindFileData_FindFirstFile(const cha
else
searchOps = FindExSearchNameMatch;
UTF16String wPath = UTF8Decode(findStr);
findData->mHandle = ::FindFirstFileExW(wPath.c_str(), FindExInfoBasic, &findData->mFindData, searchOps, NULL, 0);
if (findData->mHandle == INVALID_HANDLE_VALUE)
{