fatfs: Fixed ENOTEMPTY error for removing a directory

geky · geky · commit 5efda4b922f1 · 2018-05-17T10:26:32.000-05:00
diff --git a/features/filesystem/fat/FATFileSystem.cpp b/features/filesystem/fat/FATFileSystem.cpp
@@ -404,6 +404,10 @@ int FATFileSystem::remove(const char *path)
 
     if (res != FR_OK) {
         debug_if(FFS_DBG, "f_unlink() failed: %d\n", res);
+        if (res == FR_DENIED) {
+            printf("hi %d -> %d\n", FR_DENIED, -ENOTEMPTY);
+            return -ENOTEMPTY;
+        }
     }
     return fat_error_remap(res);
 }

Original file line number	Diff line number	Diff line change
`@@ -404,6 +404,10 @@ int FATFileSystem::remove(const char *path)`
`404`	`404`
`405`	`405`	`if (res != FR_OK) {`
`406`	`406`	`debug_if(FFS_DBG, "f_unlink() failed: %d\n", res);`
	`407`	`+ if (res == FR_DENIED) {`
	`408`	`+ printf("hi %d -> %d\n", FR_DENIED, -ENOTEMPTY);`
	`409`	`+ return -ENOTEMPTY;`
	`410`	`+ }`
`407`	`411`	`}`
`408`	`412`	`return fat_error_remap(res);`
`409`	`413`	`}`