espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-07 14:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/vfs_fat_(p)write_on_diskfull' into 'master'

Browse Source 
vfs: bugfix vfs_fat_write/pwrite upon disk-full

Closes IDFGH-2995

See merge request espressif/esp-idf!17515
This commit is contained in:
Vamshi Gajjela
2022-03-22 21:07:42 +08:00
parent 318fa0d2e8 66561f838d
commit edb66b674f
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/fatfs/vfs/vfs_fat.c
View File

@@ -369,6 +369,10 @@ static ssize_t vfs_fat_write(void* ctx, int fd, const void * data, size_t size)
} }
unsigned written = 0; unsigned written = 0;
res = f_write(file, data, size, &written); res = f_write(file, data, size, &written);
if (((written == 0) && (size != 0)) && (res == 0)) {
errno = ENOSPC;
return -1;
}
if (res != FR_OK) { if (res != FR_OK) {
ESP_LOGD(TAG, "%s: fresult=%d", __func__, res); ESP_LOGD(TAG, "%s: fresult=%d", __func__, res);
errno = fresult_to_errno(res); errno = fresult_to_errno(res);
@@ -453,6 +457,10 @@ static ssize_t vfs_fat_pwrite(void *ctx, int fd, const void *src, size_t size, o
unsigned wr = 0; unsigned wr = 0;
f_res = f_write(file, src, size, &wr); f_res = f_write(file, src, size, &wr);
if (((wr == 0) && (size != 0)) && (f_res == 0)) {
errno = ENOSPC;
return -1;
}
if (f_res == FR_OK) { if (f_res == FR_OK) {
ret = wr; ret = wr;
} else { } else {