piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2342 from opentx/projectkk2glider/issue_2301_findTrueFileName_fix_on_windows_for_next

Browse Source 
Fixes #2301: findTrueFileName() was not finding any files on Windows
This commit is contained in:
Bertrand Songis
2015-05-25 22:21:57 +02:00
parent 1dc10122ea e9c4274503
commit 69b6a98777
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/simu/simpgmspace.cpp
+16 -18
View File
@@ -706,28 +706,26 @@ char *findTrueFileName(const char *path)
char fname[_MAX_FNAME];
char ext[_MAX_EXT];
_splitpath(path, drive, dir, fname, ext);
std::string fileName = std::string(fname) + "." + std::string(ext);
std::string fileName = std::string(fname) + std::string(ext);
std::string dirName = std::string(drive) + std::string(dir);
if (dir) {
// TRACE("\tsearching for: %s", fileName.c_str());
WIN32_FIND_DATA ffd;
HANDLE hFind = FindFirstFile(dirName.c_str(), &ffd);
if (INVALID_HANDLE_VALUE != hFind) {
do {
if (ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY == 0) {
// TRACE("comparing with: %s", ffd.cFileName);
if (!strcasecmp(fileName.c_str(), ffd.cFileName)) {
strcpy(result, dirName.c_str());
strcat(result, "/");
strcat(result, ffd.cFileName);
TRACE("\tfound: %s", ffd.cFileName);
fileMap.insert(filemap_t:: value_type(path, result));
return result;
}
std::string searchName = dirName + "*";
// TRACE("\tsearching for: %s", fileName.c_str());
WIN32_FIND_DATA ffd;
HANDLE hFind = FindFirstFile(searchName.c_str(), &ffd);
if (INVALID_HANDLE_VALUE != hFind) {
do {
if (!(ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
//TRACE("comparing with: %s", ffd.cFileName);
if (!strcasecmp(fileName.c_str(), ffd.cFileName)) {
strcpy(result, dirName.c_str());
strcat(result, ffd.cFileName);
TRACE("\tfound: %s", ffd.cFileName);
fileMap.insert(filemap_t:: value_type(path, result));
return result;
}
}
while (FindNextFile(hFind, &ffd) != 0);
}
while (FindNextFile(hFind, &ffd) != 0);
}
#else
strcpy(result, path);