fatfs: use cluster size for st_blksize in stat

Author: totalspectrum

Changelog.txt

@@ -4,6 +4,7 @@ Version 7.1.0
 - Added DITTO to duplicate code/data in Spin2 assembly
 - Many internal changes to support DITTO and future assembly work
 - Updated -gbrk debug code (thanks Ada)
+- Use cluster size for stat() st_blksize on FAT32
 
 Version 7.0.5
 - Fixed internal handle usage to avoid conflicts with BASIC hard-coded handles

include/filesys/fatfs/fatfs.cc

@@ -224,6 +224,7 @@ int v_stat(const char *name, struct stat *buf)
     int r;
     FILINFO finfo;
     unsigned mode;
+    unsigned clustersize = 4096;
 #ifdef _DEBUG_FATFS
     __builtin_printf("v_stat(%s)\n", name);
 #endif
@@ -234,6 +235,7 @@ int v_stat(const char *name, struct stat *buf)
         r = 0;
     } else {
         r = f_stat(name, &finfo);
+        clustersize = finfo.fclust;
     }
     if (r != 0) {
         return _set_dos_error(r);
@@ -248,8 +250,8 @@ int v_stat(const char *name, struct stat *buf)
     buf->st_mode = mode;
     buf->st_nlink = 1;
     buf->st_size = finfo.fsize;
-    buf->st_blksize = 512;
-    buf->st_blocks = (finfo.fsize + 511) / 512;
+    buf->st_blksize = clustersize;
+    buf->st_blocks = (finfo.fsize + clustersize - 1) / clustersize;
     buf->st_atime = buf->st_mtime = buf->st_ctime = unixtime(finfo.fdate, finfo.ftime);
 #ifdef _DEBUG_FATFS
     __builtin_printf("v_stat returning %d mode=0x%x\n", r, buf->st_mode);

include/filesys/fatfs/ff.c

@@ -4754,6 +4754,7 @@ FRESULT f_stat (
 		FREE_NAMBUF();
 	}
 
+        if (fno) fno->fclust = (DWORD)dj.obj.fs->csize * SS(dj.obj.fs);
 	LEAVE_FF(dj.obj.fs, res);
 }
 

include/filesys/fatfs/ff.h

@@ -249,6 +249,7 @@ typedef struct {
 	WORD	fdate;			/* Modified date */
 	WORD	ftime;			/* Modified time */
 	BYTE	fattrib;		/* File attribute */
+	DWORD	fclust;			/* File cluster size in bytes */
 #if FF_USE_LFN
 	TCHAR	altname[FF_SFN_BUF + 1];/* Altenative file name */
 	TCHAR	fname[FF_LFN_BUF + 1];	/* Primary file name */