Merge pull request QB64-Phoenix-Edition#501 from a740g/main

Make _FILES$ default to "*" if fileSpec$ is an empty string
a740g · Jun 3, 2024 · 5fb0604 · 5fb0604
2 parents 6579cef + 41b744c
commit 5fb0604
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 5 deletions.
diff --git a/internal/c/libqb/src/filesystem.cpp b/internal/c/libqb/src/filesystem.cpp
@@ -635,7 +635,7 @@ qbs *func__files(qbs *qbsFileSpec, int32_t passed) {
         std::string fileSpec(reinterpret_cast<char *>(qbsFileSpec->chr), qbsFileSpec->len);
 
         if (fileSpec.empty())
-            fileSpec = "*.*";
+            fileSpec = "*";
 
         if (FS_DirectoryExists(filepath_fix_directory(fileSpec))) {
             directory = fileSpec;

diff --git a/tests/compile_tests/filesystem/filesys_test.bas b/tests/compile_tests/filesystem/filesys_test.bas
@@ -20,7 +20,7 @@ NAME "temp_dir" AS "dummy_dir"
 PRINT "_DIREXISTS(dummy_dir):"; _DIREXISTS("./dummy_dir")
 
 PRINT "Creating a temporary file inside dummy_dir"
-DIM fileName AS STRING: fileName = CreateDummyFile$("./dummy_dir/")
+DIM fileName AS STRING: fileName = CreateDummyFile("./dummy_dir/", ".tmp")
 
 PRINT "_FILEEXISTS(fileName):"; _FILEEXISTS(fileName)
 
@@ -29,9 +29,41 @@ KILL fileName
 
 PRINT "Creating 10 dummy files inside dummy_dir"
 DIM i AS LONG: FOR i = 0 TO 9
-    fileName = CreateDummyFile$("./dummy_dir/")
+    fileName = CreateDummyFile("./dummy_dir/", ".tmp")
 NEXT i
 
+' Start _FILES$ test
+CHDIR "dummy_dir"
+
+fileName = CreateDummyFile("./", "")
+
+i = 0
+DIM dirEntry AS STRING: dirEntry = _FILES$("") ' should count 13 entries
+
+DO WHILE LEN(dirEntry) > 0
+    i = i + 1
+
+    dirEntry = _FILES$
+LOOP
+
+PRINT "Counted"; i; "entries."
+
+i = 0
+dirEntry = _FILES$("*.*") ' should count 12 entries
+
+DO WHILE LEN(dirEntry) > 0
+    i = i + 1
+
+    dirEntry = _FILES$
+LOOP
+
+PRINT "Counted"; i; "entries."
+
+KILL fileName
+
+CHDIR ".."
+' End _FILES$ test
+
 PRINT "Deleting all 10 dummy files"
 KILL "./dummy_dir/*.tmp"
 
@@ -44,9 +76,10 @@ test_failed:
 PRINT "Test failed!"
 SYSTEM 1
 
-FUNCTION CreateDummyFile$ (directory AS STRING)
+
+FUNCTION CreateDummyFile$ (directory AS STRING, extension AS STRING)
     DO
-        DIM fileName AS STRING: fileName = directory + LTRIM$(STR$(100! * (TIMER + RND))) + ".tmp"
+        DIM fileName AS STRING: fileName = directory + LTRIM$(STR$(100! * (TIMER + RND))) + extension
     LOOP WHILE _FILEEXISTS(fileName)
 
     DIM h AS LONG: h = FREEFILE

diff --git a/tests/compile_tests/filesystem/filesys_test.output b/tests/compile_tests/filesystem/filesys_test.output
@@ -7,5 +7,7 @@ Creating a temporary file inside dummy_dir
 _FILEEXISTS(fileName):-1 
 Deleting fileName
 Creating 10 dummy files inside dummy_dir
+Counted 13 entries.
+Counted 12 entries.
 Deleting all 10 dummy files
 Deleting dummy_dir