Merge pull request #288 from igrr/bugfix/spiffs_readdir_errcode

fix SPIFFS_readdir setting errno to SPIFFS_VIS_END at the end of iteration
pellepl · Jun 1, 2022 · 0dbb3f7 · 0dbb3f7
2 parents 2b73a7f + 1239341
commit 0dbb3f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/spiffs_hydrogen.c b/src/spiffs_hydrogen.c
@@ -1121,6 +1121,8 @@ struct spiffs_dirent *SPIFFS_readdir(spiffs_DIR *d, struct spiffs_dirent *e) {
     d->entry = entry + 1;
     e->obj_id &= ~SPIFFS_OBJ_ID_IX_FLAG;
     ret = e;
+  } else if (res == SPIFFS_VIS_END) {
+    // end of iteration
   } else {
     d->fs->err_code = res;
   }

diff --git a/src/test/test_hydrogen.c b/src/test/test_hydrogen.c
@@ -439,6 +439,7 @@ TEST(list_dir)
 #endif
     }
   }
+  TEST_CHECK_EQ(SPIFFS_errno(FS), SPIFFS_OK);
   SPIFFS_closedir(&d);
 
   TEST_CHECK(found == file_cnt);