Make relative paths match the default VFS, if provided

https://github.com/espressif/esp-idf/issues/158
pull/726/head
Deomid Ryabkov 2017-06-23 13:07:43 +01:00
rodzic 3bd3640d60
commit ee5eba793f
2 zmienionych plików z 7 dodań i 0 usunięć

Wyświetl plik

@ -197,6 +197,8 @@ TEST_CASE("vfs parses paths correctly", "[vfs]")
test_dir_opened(&inst_foobar, "/foo/bar/file");
inst_toplevel.match_path = "/tmp/foo";
test_opened(&inst_toplevel, "/tmp/foo");
inst_toplevel.match_path = "foo";
test_opened(&inst_toplevel, "foo");
TEST_ESP_OK( esp_vfs_unregister("/foo") );
TEST_ESP_OK( esp_vfs_unregister("/foo1") );

Wyświetl plik

@ -142,6 +142,11 @@ static const vfs_entry_t* get_vfs_for_path(const char* path)
memcmp(path, vfs->path_prefix, vfs->path_prefix_len) != 0) {
continue;
}
// this is the default VFS and we don't have a better match yet.
if (vfs->path_prefix_len == 0 && !best_match) {
best_match = vfs;
continue;
}
// if path is not equal to the prefix, expect to see a path separator
// i.e. don't match "/data" prefix for "/data1/foo.txt" path
if (len > vfs->path_prefix_len &&