Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/default_vfs_paths' into 'master'

Browse source 
Make relative paths match the default VFS, if provided

See merge request !913
This commit is contained in:
Ivan Grokhotkov 2017-06-26 14:03:22 +08:00
parent 9716447fcc ee5eba793f
commit ff6a3b1a11
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/vfs/test/test_vfs_paths.c
View file

@ -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") );

5
components/vfs/vfs.c
View file

@ -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 &&