luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lib: Win32 port of the Database segbits enumeration 

lib/database.cc used glob(3) to enumerate segbits files, which is
unavailable on Windows. Add an #ifdef _WIN32 branch using
FindFirstFileA/FindNextFileA; the POSIX glob path is unchanged.
This commit is contained in:
Carlos Venegas Arrabé 2026-07-30 16:18:36 +02:00
parent a2c712e588
commit 78019690be
No known key found for this signature in database
GPG Key ID: EC73A5348B584C4C
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/database.cc
View File

@ -9,7 +9,11 @@
*/ */
#include <prjxray/database.h> #include <prjxray/database.h>
#ifdef _WIN32
#include <windows.h>
#else
#include <glob.h> #include <glob.h>
#endif
#include <memory> #include <memory>
@ -23,6 +27,25 @@ std::vector<std::unique_ptr<prjxray::SegbitsFileReader>> Database::segbits()
const { const {
std::vector<std::unique_ptr<prjxray::SegbitsFileReader>> segbits; std::vector<std::unique_ptr<prjxray::SegbitsFileReader>> segbits;
#ifdef _WIN32
const std::string pattern =
absl::StrCat(db_path_, "/", kSegbitsGlobPattern);
WIN32_FIND_DATAA find_data;
HANDLE handle = FindFirstFileA(pattern.c_str(), &find_data);
if (handle == INVALID_HANDLE_VALUE) {
return {};
}
do {
auto this_segbit = SegbitsFileReader::InitWithFile(
absl::StrCat(db_path_, "/", find_data.cFileName));
if (this_segbit) {
segbits.emplace_back(std::move(this_segbit));
}
} while (FindNextFileA(handle, &find_data));
FindClose(handle);
#else
glob_t segbits_glob_results; glob_t segbits_glob_results;
int ret = glob(absl::StrCat(db_path_, "/", kSegbitsGlobPattern).c_str(), int ret = glob(absl::StrCat(db_path_, "/", kSegbitsGlobPattern).c_str(),
GLOB_NOSORT | GLOB_TILDE, NULL, &segbits_glob_results); GLOB_NOSORT | GLOB_TILDE, NULL, &segbits_glob_results);
@ -39,6 +62,7 @@ std::vector<std::unique_ptr<prjxray::SegbitsFileReader>> Database::segbits()
} }
globfree(&segbits_glob_results); globfree(&segbits_glob_results);
#endif
return segbits; return segbits;
} }