alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

vfs/fatfs: fix stat call failing when called for mount point

Browse Source 
FATFS does not support f_stat call for drive root. When handling stat
for drive root, don't call f_stat and just return struct st with S_IFDIR
flag set.

Closes #984
This commit is contained in:
Ivan Grokhotkov 2017-12-08 19:58:39 +08:00
parent 033124be14
commit 96be8f2efa
5 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/fatfs/src/vfs_fat.c
View File

@ -395,8 +395,23 @@ static int vfs_fat_fstat(void* ctx, int fd, struct stat * st)
return 0; return 0;
} }
static inline mode_t get_stat_mode(bool is_dir)
{
return S_IRWXU | S_IRWXG | S_IRWXO |
((is_dir) ? S_IFDIR : S_IFREG);
}
static int vfs_fat_stat(void* ctx, const char * path, struct stat * st) static int vfs_fat_stat(void* ctx, const char * path, struct stat * st)
{ {
if (strcmp(path, "/") == 0) {
/* FatFS f_stat function does not work for the drive root.
* Just pretend that this is a directory.
*/
memset(st, 0, sizeof(*st));
st->st_mode = get_stat_mode(true);
return 0;
}
vfs_fat_ctx_t* fat_ctx = (vfs_fat_ctx_t*) ctx; vfs_fat_ctx_t* fat_ctx = (vfs_fat_ctx_t*) ctx;
_lock_acquire(&fat_ctx->lock); _lock_acquire(&fat_ctx->lock);
prepend_drive_to_path(fat_ctx, &path, NULL); prepend_drive_to_path(fat_ctx, &path, NULL);
@ -408,9 +423,10 @@ static int vfs_fat_stat(void* ctx, const char * path, struct stat * st)
errno = fresult_to_errno(res); errno = fresult_to_errno(res);
return -1; return -1;
} }
memset(st, 0, sizeof(*st));
st->st_size = info.fsize; st->st_size = info.fsize;
st->st_mode = S_IRWXU | S_IRWXG | S_IRWXO | st->st_mode = get_stat_mode((info.fattrib & AM_DIR) != 0);
((info.fattrib & AM_DIR) ? S_IFDIR : S_IFREG);
struct tm tm; struct tm tm;
uint16_t fdate = info.fdate; uint16_t fdate = info.fdate;
tm.tm_mday = fdate & 0x1f; tm.tm_mday = fdate & 0x1f;

19
components/fatfs/test/test_fatfs_common.c
View File

@ -125,15 +125,15 @@ void test_fatfs_lseek(const char* filename)
TEST_ASSERT_EQUAL(0, fclose(f)); TEST_ASSERT_EQUAL(0, fclose(f));
} }
void test_fatfs_stat(const char* filename) void test_fatfs_stat(const char* filename, const char* root_dir)
{ {
struct tm tm; struct tm tm;
tm.tm_year = 2016 - 1900; tm.tm_year = 2017 - 1900;
tm.tm_mon = 0; tm.tm_mon = 11;
tm.tm_mday = 10; tm.tm_mday = 8;
tm.tm_hour = 16; tm.tm_hour = 19;
tm.tm_min = 30; tm.tm_min = 51;
tm.tm_sec = 0; tm.tm_sec = 10;
time_t t = mktime(&tm); time_t t = mktime(&tm);
printf("Setting time: %s", asctime(&tm)); printf("Setting time: %s", asctime(&tm));
struct timeval now = { .tv_sec = t }; struct timeval now = { .tv_sec = t };
@ -151,6 +151,11 @@ void test_fatfs_stat(const char* filename)
TEST_ASSERT(st.st_mode & S_IFREG); TEST_ASSERT(st.st_mode & S_IFREG);
TEST_ASSERT_FALSE(st.st_mode & S_IFDIR); TEST_ASSERT_FALSE(st.st_mode & S_IFDIR);
memset(&st, 0, sizeof(st));
TEST_ASSERT_EQUAL(0, stat(root_dir, &st));
TEST_ASSERT(st.st_mode & S_IFDIR);
TEST_ASSERT_FALSE(st.st_mode & S_IFREG);
} }
void test_fatfs_unlink(const char* filename) void test_fatfs_unlink(const char* filename)

2
components/fatfs/test/test_fatfs_common.h
View File

@ -43,7 +43,7 @@ void test_fatfs_open_max_files(const char* filename_prefix, size_t files_count);
void test_fatfs_lseek(const char* filename); void test_fatfs_lseek(const char* filename);
void test_fatfs_stat(const char* filename); void test_fatfs_stat(const char* filename, const char* root_dir);
void test_fatfs_unlink(const char* filename); void test_fatfs_unlink(const char* filename);

2
components/fatfs/test/test_fatfs_sdmmc.c
View File

@ -105,7 +105,7 @@ TEST_CASE("(SD) can lseek", "[fatfs][sdcard][ignore]")
TEST_CASE("(SD) stat returns correct values", "[fatfs][ignore]") TEST_CASE("(SD) stat returns correct values", "[fatfs][ignore]")
{ {
test_setup(); test_setup();
test_fatfs_stat("/sdcard/stat.txt"); test_fatfs_stat("/sdcard/stat.txt", "/sdcard");
test_teardown(); test_teardown();
} }

2
components/fatfs/test/test_fatfs_spiflash.c
View File

@ -100,7 +100,7 @@ TEST_CASE("(WL) can lseek", "[fatfs][wear_levelling]")
TEST_CASE("(WL) stat returns correct values", "[fatfs][wear_levelling]") TEST_CASE("(WL) stat returns correct values", "[fatfs][wear_levelling]")
{ {
test_setup(); test_setup();
test_fatfs_stat("/spiflash/stat.txt"); test_fatfs_stat("/spiflash/stat.txt", "/spiflash");
test_teardown(); test_teardown();
} }