QB64/QB64-PE
QB64/QB64-PE
1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-07-04 04:50:22 +00:00
Code Issues Releases Wiki Activity

Update func__files() to return directory names with trailing slash

Browse source
This commit is contained in:
Samuel Gomes 2023-12-28 01:50:24 +05:30
parent 28c9964d09
commit c558d2a2d2
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
internal/c/libqb/src/filesystem.cpp
View file

@ -629,6 +629,8 @@ static const char *GetDirectoryEntryName(const char *fileSpec) {
/// @param passed Flags for optional parameters
/// @return Retuns a qbs with the directory entry name or an empty string if there are no more entries
qbs *func__files(qbs *qbsFileSpec, int32_t passed) {
static std::string directory;
std::string pathName;
const char *entry;
qbs *final;
@ -636,6 +638,7 @@ qbs *func__files(qbs *qbsFileSpec, int32_t passed) {
if (passed) {
std::string fileSpec(reinterpret_cast<char *>(qbsFileSpec->chr), qbsFileSpec->len);
filepath_split(fileSpec, directory, pathName); // split the file path
entry = GetDirectoryEntryName(fileSpec.c_str());
if (IsStringEmpty(entry)) {
@ -648,10 +651,10 @@ qbs *func__files(qbs *qbsFileSpec, int32_t passed) {
entry = GetDirectoryEntryName(nullptr);
}
filepath_join(pathName, directory, entry);
auto size = strlen(entry);
// TODO: Need to join the base directory here!
if (DirectoryExists(entry)) {
if (size && DirectoryExists(pathName.c_str())) {
// Add a trailing slash if it is a directory
final = qbs_new(size + 1, 1);
memcpy(final->chr, entry, size);