blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 01:29:21 -04:00
Code Issues Projects Releases Wiki Activity

fix(storage/vfs): incorrect registration checks

Browse Source
This commit is contained in:
Tomáš Rohlínek 2024-08-06 10:56:30 +02:00 committed by BOT
parent 36d821f70c
commit fe0fc40049
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/vfs/include/esp_vfs.h
View File

@ -486,6 +486,8 @@ ssize_t esp_vfs_pwrite(int fd, const void *src, size_t size, off_t offset);
*/ */
void esp_vfs_dump_fds(FILE *fp); void esp_vfs_dump_fds(FILE *fp);
void esp_vfs_dump_registered_paths(FILE *fp);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif

16
components/vfs/vfs.c
View File

@ -77,7 +77,7 @@ static fd_table_t s_fd_table[MAX_FDS] = { [0 ... MAX_FDS-1] = FD_TABLE_ENTRY_UNU
static _lock_t s_fd_table_lock; static _lock_t s_fd_table_lock;
static ssize_t esp_get_free_index(void) { static ssize_t esp_get_free_index(void) {
for (ssize_t i = 0; i < MAX_FDS; i++) { for (ssize_t i = 0; i < VFS_MAX_COUNT; i++) {
if (s_vfs[i] == NULL) { if (s_vfs[i] == NULL) {
return i; return i;
} }
@ -294,7 +294,7 @@ static esp_err_t esp_vfs_register_minified_common(const char* base_path, size_t
} else { } else {
bzero(entry->path_prefix, sizeof(entry->path_prefix)); bzero(entry->path_prefix, sizeof(entry->path_prefix));
} }
entry->path_prefix_len = strlen(base_path); entry->path_prefix_len = len;
entry->vfs = vfs; entry->vfs = vfs;
entry->ctx = ctx; entry->ctx = ctx;
entry->offset = index; entry->offset = index;
@ -326,6 +326,7 @@ esp_err_t esp_vfs_register_minified(const char* base_path, const esp_vfs_minifie
esp_err_t ret = esp_vfs_register_minified_common(base_path, strlen(base_path), _vfs, flags, ctx, NULL); esp_err_t ret = esp_vfs_register_minified_common(base_path, strlen(base_path), _vfs, flags, ctx, NULL);
if (ret != ESP_OK) { if (ret != ESP_OK) {
esp_free_minified_vfs(_vfs); esp_free_minified_vfs(_vfs);
return ret;
} }
return ESP_OK; return ESP_OK;
@ -354,6 +355,7 @@ esp_err_t esp_vfs_register_common(const char* base_path, size_t len, const esp_v
esp_err_t ret = esp_vfs_register_minified_common(base_path, len, _vfs, vfs->flags, ctx, vfs_index); esp_err_t ret = esp_vfs_register_minified_common(base_path, len, _vfs, vfs->flags, ctx, vfs_index);
if (ret != ESP_OK) { if (ret != ESP_OK) {
esp_free_minified_vfs(_vfs); esp_free_minified_vfs(_vfs);
return ret;
} }
return ESP_OK; return ESP_OK;
@ -542,6 +544,16 @@ void esp_vfs_dump_fds(FILE *fp)
_lock_release(&s_fd_table_lock); _lock_release(&s_fd_table_lock);
} }
void esp_vfs_dump_registered_paths(FILE *fp)
{
fprintf(fp, "------------------------------------------------------\n");
fprintf(fp, "<index>:<VFS Path Prefix> -> <VFS entry ptr>\n");
fprintf(fp, "------------------------------------------------------\n");
for (size_t i = 0; i < VFS_MAX_COUNT; ++i) {
fprintf(fp, "%d:%s -> %p\n", i, s_vfs[i] ? s_vfs[i]->path_prefix : "NULL", s_vfs[i]);
}
}
/* /*
* Set ESP_VFS_FLAG_READONLY_FS read-only flag for a registered virtual filesystem * Set ESP_VFS_FLAG_READONLY_FS read-only flag for a registered virtual filesystem
* for given path prefix. Should be only called from the esp_vfs_*filesystem* register * for given path prefix. Should be only called from the esp_vfs_*filesystem* register