PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #348 from KY-zhang-X/pr

Browse Source 
Fix bug for VFS & FatFS component
This commit is contained in:
Supowang
2022-08-09 11:49:02 +08:00
committed by GitHub
parent 796223ab32 24d7a9c591
commit 131553c31a
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.gitignore vendored
View File

@@ -24,12 +24,13 @@
.DS_Store .DS_Store
board/**/build board/**/build
board/**/.settings board/**/.settings
board/*/MDK-ARM/DebugConfig/ board/*/KEIL/*/DebugConfig/
board/*/obj/ board/*/obj/
board/*/MDK-ARM/Obj/ board/*/KEIL/*/Obj/
board/*/MDK-ARM/RTE/ board/*/KEIL/*/RTE/
board/*/MDK-ARM/*.uvguix.* board/*/KEIL/*/*.uvguix.*
board/*/MDK-ARM/EventRecorderStub.scvd board/*/KEIL/*/EventRecorderStub.scvd
board/*/MDK-ARM/*/*.htm board/*/KEIL/*/*/*.htm
board/*/MDK-ARM/*/*.build_log.htm board/*/KEIL/*/*/*.build_log.htm
board/**/settings/* board/**/settings/*
.vscode

2
components/fs/fatfs/wrapper/tos_fatfs_vfs.c
View File

@@ -220,7 +220,7 @@ static int fatfs_readdir(vfs_dir_t *dir, vfs_dirent_t *dirent)
dp = (DIR *)dir->private; dp = (DIR *)dir->private;
res = tos_f_readdir(dp, &info); res = tos_f_readdir(dp, &info);
if (res != FR_OK) { if (res != FR_OK || info.fname[0] == 0) {
return -1; return -1;
} }

1
components/fs/fatfs/wrapper/tos_ff.c
View File

@@ -4397,6 +4397,7 @@ FRESULT tos_f_stat (
/* Get logical drive */ /* Get logical drive */
res = find_volume(fs, 0); res = find_volume(fs, 0);
dj.obj.fs = fs;
if (res == FR_OK) { if (res == FR_OK) {
INIT_NAMBUF(dj.obj.fs); INIT_NAMBUF(dj.obj.fs);
res = follow_path(&dj, path); /* Follow the file path */ res = follow_path(&dj, path); /* Follow the file path */

2
components/fs/vfs/tos_vfs.c
View File

@@ -430,7 +430,7 @@ __API__ vfs_dirent_t *tos_vfs_readdir(VFS_DIR *dirp)
vfs_dir_t *dir = K_NULL; vfs_dir_t *dir = K_NULL;
vfs_inode_t *inode = K_NULL; vfs_inode_t *inode = K_NULL;
if (!dir) { if (!dirp) {
return K_NULL; return K_NULL;
} }