Skip to content

rmdir causes issues in SPIFFS. Fixes #4138, albeit not very cleanly #4154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 1, 2020
Merged

rmdir causes issues in SPIFFS. Fixes #4138, albeit not very cleanly #4154

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e151d5b
rmdir causes issues in SPIFFS. Fixes #4138, albeit not very cleanly
lbernstone Jul 10, 2020
9f8794a
don't string literal comparison
lbernstone Jul 10, 2020
da0861f
lost a CR somewhere
lbernstone Jul 10, 2020
b8db69f
function name overlap- needs to use the exfun!
lbernstone Jul 10, 2020
8723b6d
Don't even bother opening the file if on spiffs
lbernstone Jul 10, 2020
db8ec10
missed some cleanup
lbernstone Jul 10, 2020
e4c2511
really, this time
lbernstone Jul 10, 2020
9986315
move things back to where they were
lbernstone Jul 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion libraries/FS/src/vfs_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,11 @@ bool VFSImpl::rmdir(const char *path)
return false;
}

if (strcmp(_mountpoint, "/spiffs") == 0) {
log_e("rmdir is unnecessary in SPIFFS");
return false;
}

VFSFileImpl f(this, path, "r");
if(!f || !f.isDirectory()) {
if(f) {
Expand All @@ -200,7 +205,7 @@ bool VFSImpl::rmdir(const char *path)
return false;
}
sprintf(temp,"%s%s", _mountpoint, path);
auto rc = unlink(temp);
auto rc = ::rmdir(temp);
free(temp);
return rc == 0;
}
Expand Down