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

Make _FILES$() throw an error if it called with an argument the first time

Browse source
This commit is contained in:
Samuel Gomes 2024-01-04 04:46:14 +05:30
parent c5242929d5
commit 2bf7b7919c
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -625,10 +625,13 @@ qbs *func__files(qbs *qbsFileSpec, int32_t passed) {
if (passed) {
std::string fileSpec(reinterpret_cast<char *>(qbsFileSpec->chr), qbsFileSpec->len);
if (FS_DirectoryExists(filepath_fix_directory(fileSpec)))
if (FS_DirectoryExists(filepath_fix_directory(fileSpec))) {
directory = fileSpec;
else
} else {
filepath_split(fileSpec, directory, pathName); // split the file path
if (directory.empty())
directory = "./";
}
entry = FS_GetDirectoryEntryName(fileSpec.c_str());
@ -639,7 +642,15 @@ qbs *func__files(qbs *qbsFileSpec, int32_t passed) {
return qbsFinal;
}
} else {
entry = FS_GetDirectoryEntryName(nullptr);
// Check if we've been called the first time without a filespec
if (directory.empty()) {
// This is per MS BASIC PDS 7.1 and VBDOS 1.0 behavior
qbsFinal = qbs_new(0, 1);
error(QB_ERROR_ILLEGAL_FUNCTION_CALL);
return qbsFinal;
}
entry = FS_GetDirectoryEntryName(nullptr); // get the next entry
}
filepath_join(pathName, directory, entry);
@ -655,6 +666,9 @@ qbs *func__files(qbs *qbsFileSpec, int32_t passed) {
memcpy(qbsFinal->chr, entry, size);
}
if (!size)
directory.clear(); // clear the directory string since we are done with the session
return qbsFinal;
}
@ -785,7 +799,7 @@ void sub_files(qbs *str, int32_t passed) {
directory = FS_GetFQN(fileSpec.c_str());
}
if (!directory.size()) {
if (directory.empty()) {
// Invalid filespec
error(QB_ERROR_ILLEGAL_FUNCTION_CALL);
return;