djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #953 from dhalbert/allow-mount-slash 

Allow mounting '/' on '/'
This commit is contained in:
Scott Shawcroft 2018-06-24 22:59:14 -07:00 committed by GitHub
parent de4cd1ee73 dbf1a2f7d5
commit 5ae8094747
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extmod/vfs_fat_diskio.c
View File

@ -135,7 +135,7 @@ DRESULT disk_read (
if (nlr_push(&nlr) == 0) { if (nlr_push(&nlr) == 0) {
mp_obj_t ret = mp_call_method_n_kw(2, 0, vfs->readblocks); mp_obj_t ret = mp_call_method_n_kw(2, 0, vfs->readblocks);
nlr_pop(); nlr_pop();
if (mp_obj_get_int(ret) != 0) { if (ret != mp_const_none && MP_OBJ_SMALL_INT_VALUE(ret) != 0) {
return RES_ERROR; return RES_ERROR;
} }
} else { } else {
@ -180,7 +180,7 @@ DRESULT disk_write (
if (nlr_push(&nlr) == 0) { if (nlr_push(&nlr) == 0) {
mp_obj_t ret = mp_call_method_n_kw(2, 0, vfs->writeblocks); mp_obj_t ret = mp_call_method_n_kw(2, 0, vfs->writeblocks);
nlr_pop(); nlr_pop();
if (mp_obj_get_int(ret) != 0) { if (ret != mp_const_none && MP_OBJ_SMALL_INT_VALUE(ret) != 0) {
return RES_ERROR; return RES_ERROR;
} }
} else { } else {

15
shared-module/storage/__init__.c
View File

@ -65,12 +65,15 @@ void common_hal_storage_mount(mp_obj_t vfs_obj, const char* mount_path, bool rea
args[1] = mp_const_false; // Don't make the file system automatically when mounting. args[1] = mp_const_false; // Don't make the file system automatically when mounting.
// Check that there's no file or directory with the same name as the mount point. // Check that there's no file or directory with the same name as the mount point.
nlr_buf_t nlr; // But it's ok to mount '/' in any case.
if (nlr_push(&nlr) == 0) { if (strcmp(vfs->str, "/") != 0) {
common_hal_os_stat(mount_path); nlr_buf_t nlr;
nlr_pop(); if (nlr_push(&nlr) == 0) {
// Something with the same name exists. common_hal_os_stat(mount_path);
mp_raise_OSError(MP_EEXIST); nlr_pop();
// Something with the same name exists.
mp_raise_OSError(MP_EEXIST);
}
} }
// check that the destination mount point is unused // check that the destination mount point is unused