Skip to content

Fix mbed::Dir type handling in fat_filesystem #13949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 25, 2020
Merged

Fix mbed::Dir type handling in fat_filesystem #13949

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions storage/filesystem/fat/tests/TESTS/fat/fat_filesystem/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,28 +134,28 @@ void test_read_dir()
err = dir.open(&fs, "test_read_dir");
TEST_ASSERT_EQUAL(0, err);

struct dirent *de;
struct dirent de;
bool test_dir_found = false;
bool test_file_found = true;

while ((de = readdir(&dir))) {
printf("d_name: %.32s, d_type: %x\n", de->d_name, de->d_type);
while (dir.read(&de) == 1) {
printf("d_name: %.32s, d_type: %x\n", de.d_name, de.d_type);

if (strcmp(de->d_name, ".") == 0) {
if (strcmp(de.d_name, ".") == 0) {
test_dir_found = true;
TEST_ASSERT_EQUAL(DT_DIR, de->d_type);
} else if (strcmp(de->d_name, "..") == 0) {
TEST_ASSERT_EQUAL(DT_DIR, de.d_type);
} else if (strcmp(de.d_name, "..") == 0) {
test_dir_found = true;
TEST_ASSERT_EQUAL(DT_DIR, de->d_type);
} else if (strcmp(de->d_name, "test_dir") == 0) {
TEST_ASSERT_EQUAL(DT_DIR, de.d_type);
} else if (strcmp(de.d_name, "test_dir") == 0) {
test_dir_found = true;
TEST_ASSERT_EQUAL(DT_DIR, de->d_type);
} else if (strcmp(de->d_name, "test_file") == 0) {
TEST_ASSERT_EQUAL(DT_DIR, de.d_type);
} else if (strcmp(de.d_name, "test_file") == 0) {
test_file_found = true;
TEST_ASSERT_EQUAL(DT_REG, de->d_type);
TEST_ASSERT_EQUAL(DT_REG, de.d_type);
} else {
char *buf = new char[NAME_MAX];
snprintf(buf, NAME_MAX, "Unexpected file \"%s\"", de->d_name);
snprintf(buf, NAME_MAX, "Unexpected file \"%s\"", de.d_name);
TEST_ASSERT_MESSAGE(false, buf);
}
}
Expand Down