arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

Fix SPIFFS.openDir("") (#2143)

Browse Source 
* Update spiffs_api.cpp

Fixes a bug where un-prefixed files are irretrievable with openDir(""). Described: https://github.com/esp8266/Arduino/issues/1818.

* Update FS test cases
This commit is contained in:
Ivan Grokhotkov 2016-06-14 07:15:55 +08:00 committed by GitHub
parent 91720337d3
commit b9dfe01903
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cores/esp8266/spiffs_api.cpp
View File

@ -65,7 +65,7 @@ bool SPIFFSImpl::exists(const char* path)
DirImplPtr SPIFFSImpl::openDir(const char* path) DirImplPtr SPIFFSImpl::openDir(const char* path)
{ {
if (!isSpiffsFilenameValid(path)) { if (strlen(path) > 0 && !isSpiffsFilenameValid(path)) {
DEBUGV("SPIFFSImpl::openDir: invalid path=`%s` \r\n", path); DEBUGV("SPIFFSImpl::openDir: invalid path=`%s` \r\n", path);
return DirImplPtr(); return DirImplPtr();
} }

17
tests/host/fs/test_fs.cpp
View File

@ -160,11 +160,10 @@ TEST_CASE("File names which are too long are rejected", "[fs]")
REQUIRE(SPIFFS.open(longName_31, "w")); REQUIRE(SPIFFS.open(longName_31, "w"));
REQUIRE(SPIFFS.open(longName_31, "r")); REQUIRE(SPIFFS.open(longName_31, "r"));
REQUIRE(SPIFFS.exists(longName_31)); REQUIRE(SPIFFS.exists(longName_31));
auto files = listDir("");
REQUIRE(files.empty());
} }
TEST_CASE("#1685 Duplicate files", "[fs][bugreport]") { TEST_CASE("#1685 Duplicate files", "[fs][bugreport]")
{
SPIFFS_MOCK_DECLARE(64, 8, 512); SPIFFS_MOCK_DECLARE(64, 8, 512);
REQUIRE(SPIFFS.begin()); REQUIRE(SPIFFS.begin());
createFile("/config", "some text"); createFile("/config", "some text");
@ -173,3 +172,15 @@ TEST_CASE("#1685 Duplicate files", "[fs][bugreport]") {
createFile("/data", "more text"); createFile("/data", "more text");
listDir("/"); listDir("/");
} }
TEST_CASE("#1819 Can list all files with openDir(\"\")", "[fs][bugreport]")
{
SPIFFS_MOCK_DECLARE(64, 8, 512);
REQUIRE(SPIFFS.begin());
createFile("/file1", "some text");
createFile("/file2", "other text");
createFile("file3", "more text");
createFile("sorta-dir/file4", "\n");
auto files = listDir("");
REQUIRE(files.size() == 4);
}