Merge branch 'contribute/github_pr_17789_v5.5' into 'release/v5.5'

fix(storage/spiffs): fix readdir setting errno on directory end (v5.5) See merge request espressif/esp-idf!45381
2026-01-23 04:35:02 +08:00
parent b9990c6991 b306fa566b
commit f19b20bebd
1 changed files with 9 additions and 1 deletions
@@ -745,7 +745,15 @@ static int vfs_spiffs_readdir_r(void* ctx, DIR* pdir, struct dirent* entry,
    char * item_name;
    do {
        if (SPIFFS_readdir(&dir->d, &out) == 0) {
-            errno = spiffs_res_to_errno(SPIFFS_errno(efs->fs));
+            s32_t spiffs_res = SPIFFS_errno(efs->fs);
+            switch (spiffs_res) {
+                case SPIFFS_ERR_END_OF_OBJECT:
+                    errno = 0;
+                    break;
+                default:
+                    errno = spiffs_res_to_errno(spiffs_res);
+                    break;
+            }
            SPIFFS_clearerr(efs->fs);
            if (!errno) {
                *out_dirent = NULL;