kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-26 06:53:52 +01:00
Code Releases Activity

Merge pull request #17623 from benpicco/pkg/littlefs-readdir

Browse Source 
pkg/littlefs*: align readdir() with documentation
This commit is contained in:
benpicco 2022-02-08 12:34:26 +01:00 committed by GitHub
commit 7dca88b038
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/littlefs/fs/littlefs_fs.c
View File

@ -493,8 +493,7 @@ static int _readdir(vfs_DIR *dirp, vfs_dirent_t *entry)
int ret = lfs_dir_read(&fs->fs, dir, &info);
if (ret >= 0) {
entry->d_ino = info.type;
entry->d_name[0] = '/';
strncpy(entry->d_name + 1, info.name, VFS_NAME_MAX - 1);
strncpy(entry->d_name, info.name, VFS_NAME_MAX - 1);
}
mutex_unlock(&fs->lock);

3
pkg/littlefs2/fs/littlefs2_fs.c
View File

@ -499,8 +499,7 @@ static int _readdir(vfs_DIR *dirp, vfs_dirent_t *entry)
int ret = lfs_dir_read(&fs->fs, dir, &info);
if (ret >= 0) {
entry->d_ino = info.type;
entry->d_name[0] = '/';
strncpy(entry->d_name + 1, info.name, VFS_NAME_MAX - 1);
strncpy(entry->d_name, info.name, VFS_NAME_MAX - 1);
}
mutex_unlock(&fs->lock);

6
tests/pkg_littlefs/main.c
View File

@ -288,8 +288,8 @@ static void tests_littlefs_readdir(void)
int nb_files = 0;
do {
res = vfs_readdir(&dirp, &entry);
if (res == 1 && (strcmp("/test0.txt", &(entry.d_name[0])) == 0 ||
strcmp("/test1.txt", &(entry.d_name[0])) == 0)) {
if (res == 1 && (strcmp("test0.txt", &(entry.d_name[0])) == 0 ||
strcmp("test1.txt", &(entry.d_name[0])) == 0)) {
nb_files++;
}
} while (res == 1);
@ -305,7 +305,7 @@ static void tests_littlefs_readdir(void)
nb_files = 0;
do {
res = vfs_readdir(&dirp, &entry);
if (res == 1 && strcmp("/test2.txt", &(entry.d_name[0])) == 0) {
if (res == 1 && strcmp("test2.txt", &(entry.d_name[0])) == 0) {
nb_files++;
}
} while (res == 1);

6
tests/pkg_littlefs2/main.c
View File

@ -288,8 +288,8 @@ static void tests_littlefs_readdir(void)
int nb_files = 0;
do {
res = vfs_readdir(&dirp, &entry);
if (res == 1 && (strcmp("/test0.txt", &(entry.d_name[0])) == 0 ||
strcmp("/test1.txt", &(entry.d_name[0])) == 0)) {
if (res == 1 && (strcmp("test0.txt", &(entry.d_name[0])) == 0 ||
strcmp("test1.txt", &(entry.d_name[0])) == 0)) {
nb_files++;
}
} while (res == 1);
@ -305,7 +305,7 @@ static void tests_littlefs_readdir(void)
nb_files = 0;
do {
res = vfs_readdir(&dirp, &entry);
if (res == 1 && strcmp("/test2.txt", &(entry.d_name[0])) == 0) {
if (res == 1 && strcmp("test2.txt", &(entry.d_name[0])) == 0) {
nb_files++;
}
} while (res == 1);