port 882b12c over

me-no-dev · web-flow · commit 9a9fb2c3aad5 · 2020-11-03T19:58:23.000+02:00
ports: espressif@882b12c
diff --git a/libraries/FS/src/vfs_api.cpp b/libraries/FS/src/vfs_api.cpp
@@ -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) {
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,11 @@ bool VFSImpl::rmdir(const char *path)`
`184`	`184`	`return false;`
`185`	`185`	`}`
`186`	`186`
	`187`	`+ if (strcmp(_mountpoint, "/spiffs") == 0) {`
	`188`	`+ log_e("rmdir is unnecessary in SPIFFS");`
	`189`	`+ return false;`
	`190`	`+ }`
	`191`	`+`
`187`	`192`	`VFSFileImpl f(this, path, "r");`
`188`	`193`	`if(!f \|\| !f.isDirectory()) {`
`189`	`194`	`if(f) {`
`@@ -200,7 +205,7 @@ bool VFSImpl::rmdir(const char *path)`
`200`	`205`	`return false;`
`201`	`206`	`}`
`202`	`207`	`sprintf(temp,"%s%s", _mountpoint, path);`
`203`		`- auto rc = unlink(temp);`
	`208`	`+ auto rc = ::rmdir(temp);`
`204`	`209`	`free(temp);`
`205`	`210`	`return rc == 0;`
`206`	`211`	`}`