fix _ftello_r by wrapping it

Author: daniel-j

src/filesystem/fat.c

@@ -415,29 +415,6 @@ static int file_stat(filesystem_t *fs, const char *path, struct stat *st) {
     return 0;
 }
 
-static int file_utimes(filesystem_t *fs, const char *path, const struct timeval times[2]) {
-    filesystem_fat_context_t *context = fs->context;
-    char fpath[PATH_MAX];
-    fat_path_prefix(fpath, context->id, path);
-
-    struct tm *mtime = localtime(&times[0].tv_sec);
-
-    FILINFO f = {
-        .fdate = (WORD)(((mtime->tm_year - 80) * 512U) | mtime->tm_mon * 32U | mtime->tm_mday),
-        .ftime = (WORD)(mtime->tm_hour * 2048U | mtime->tm_min * 32U | mtime->tm_sec / 2U)
-    };
-
-    mutex_enter_blocking(&context->_mutex);
-    FRESULT res = f_utime(fpath, &f);
-    mutex_exit(&context->_mutex);
-
-    if (res != FR_OK) {
-        return fat_error_remap(res);
-    }
-
-    return 0;
-}
-
 static int file_open(filesystem_t *fs, fs_file_t *file, const char *path, int flags) {
     BYTE open_mode;
     if (flags & O_RDWR)

src/filesystem/vfs.c

@@ -562,6 +562,29 @@ off_t _lseek(int fildes, off_t offset, int whence) {
     return _error_remap(pos);
 }
 
+off_t __wrap__ftello_r(struct _reent *ptr, register FILE *fp) {
+    (void)ptr;
+    int fildes = fp->_file;
+    auto_init_recursive_mutex(_mutex);
+    recursive_mutex_enter_blocking(&_mutex);
+
+    if (!is_valid_file_descriptor(fildes)) {
+        recursive_mutex_exit(&_mutex);
+        return _error_remap(-EBADF);
+    }
+    fs_file_t *file = file_descriptor[FILENO_INDEX(fildes)].file;
+    filesystem_t *fs = file_descriptor[FILENO_INDEX(fildes)].filesystem;
+    if (fs == NULL) {
+        recursive_mutex_exit(&_mutex);
+        return _error_remap(-EBADF);
+    }
+
+    off_t pos = fs->file_tell(fs, file);
+    recursive_mutex_exit(&_mutex);
+
+    return _error_remap(pos);
+}
+
 int ftruncate(int fildes, off_t length) {
     auto_init_recursive_mutex(_mutex);
     recursive_mutex_enter_blocking(&_mutex);