Changed littlefs to remove . and .. entries in readdir

totalspectrum · Aug 18, 2023 · 1c95d92 · 1c95d92
1 parent 0d59a83
commit 1c95d92
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,5 +1,6 @@
 Version 6.3.1
 - Added getcrc() builtin for Spin2
+- Changed littlefs to not return . and .. entries in path search (so it matches host fs and FATFS)
 - Fixed compilation error for object arrays in bytecode
 - Fixed some quirks in the space/tab warning code
 

diff --git a/include/filesys/littlefs/lfs.c b/include/filesys/littlefs/lfs.c
@@ -2106,6 +2106,12 @@ int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) {
             (void*)lfs, (void*)dir, (void*)info);
     memset(info, 0, sizeof(*info));
 
+#ifdef __FLEXC__
+    // leave out . and .. entries
+    if (dir->pos == 0 || dir->pos == 1) {
+        dir->pos = 2;
+    }
+#else    
     // special offset for '.' and '..'
     if (dir->pos == 0) {
         info->type = LFS_TYPE_DIR;
@@ -2120,7 +2126,7 @@ int lfs_dir_read(lfs_t *lfs, lfs_dir_t *dir, struct lfs_info *info) {
         LFS_TRACE("lfs_dir_read -> %d", true);
         return true;
     }
-
+#endif
     while (true) {
         if (dir->id == dir->m.count) {
             if (!dir->m.split) {