AP_Filesystem: don't show directory entries for empty @ filesystems

ArduPilot · Feb 28, 2024 · 2cb5f43 · 2cb5f43
1 parent 21edc6a
commit 2cb5f43
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/libraries/AP_Filesystem/AP_Filesystem.cpp b/libraries/AP_Filesystem/AP_Filesystem.cpp
@@ -242,6 +242,14 @@ struct dirent *AP_Filesystem::readdir(DirHandle *dirp)
         if (prefix[0] != '@') {
             continue;
         }
+
+        // only return @ entries in root if we can successfully opendir them:
+        auto *d = backends[virtual_dirent.backend_ofs].fs.opendir("");
+        if (d == nullptr) {
+            continue;
+        }
+        backends[virtual_dirent.backend_ofs].fs.closedir(d);
+
         // found a virtual directory we haven't returned yet
         strncpy_noterm(virtual_dirent.de.d_name, prefix, sizeof(virtual_dirent.de.d_name));
         virtual_dirent.d_off++;