Skip to content

Commit 17e0df2

Browse files
cscd98cscd98
committed
vfs: add retro_vfs_stat64_t
1 parent 836dff1 commit 17e0df2

12 files changed

Lines changed: 109 additions & 31 deletions

‎libretro-common/file/file_path_io.c‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,27 +43,35 @@
4343
#endif
4444

4545
/* TODO/FIXME - globals */
46-
static retro_vfs_stat_t path_stat_cb = retro_vfs_stat_impl;
46+
static retro_vfs_stat_t path_stat32_cb = retro_vfs_stat_impl;
47+
static retro_vfs_stat_64_t path_stat64_cb = retro_vfs_stat_64_impl;
4748
static retro_vfs_mkdir_t path_mkdir_cb = retro_vfs_mkdir_impl;
4849

4950
void path_vfs_init(const struct retro_vfs_interface_info* vfs_info)
5051
{
5152
const struct retro_vfs_interface*
5253
vfs_iface = vfs_info->iface;
5354

54-
path_stat_cb = retro_vfs_stat_impl;
55+
path_stat32_cb = retro_vfs_stat_impl;
56+
path_stat64_cb = retro_vfs_stat_64_impl;
5557
path_mkdir_cb = retro_vfs_mkdir_impl;
5658

5759
if (vfs_info->required_interface_version < PATH_REQUIRED_VFS_VERSION || !vfs_iface)
5860
return;
5961

60-
path_stat_cb = vfs_iface->stat;
62+
path_stat32_cb = vfs_iface->stat;
6163
path_mkdir_cb = vfs_iface->mkdir;
64+
65+
if (vfs_info->required_interface_version >= STAT64_REQUIRED_VFS_VERSION)
66+
path_stat64_cb = vfs_iface->stat_64;
67+
else
68+
path_stat64_cb = NULL;
6269
}
6370

6471
int path_stat(const char *path)
6572
{
66-
return path_stat_cb(path, NULL);
73+
/* Use 64‑bit stat if available, else fallback */
74+
return path_stat64_cb ? path_stat64_cb(path, NULL) : path_stat32_cb(path, NULL);
6775
}
6876

6977
/**
@@ -76,25 +84,37 @@ int path_stat(const char *path)
7684
*/
7785
bool path_is_directory(const char *path)
7886
{
79-
return (path_stat_cb(path, NULL) & RETRO_VFS_STAT_IS_DIRECTORY) != 0;
87+
if (path_stat64_cb)
88+
return (path_stat64_cb(path, NULL) & RETRO_VFS_STAT_IS_DIRECTORY) != 0;
89+
return (path_stat32_cb(path, NULL) & RETRO_VFS_STAT_IS_DIRECTORY) != 0;
8090
}
8191

8292
bool path_is_character_special(const char *path)
8393
{
84-
return (path_stat_cb(path, NULL) & RETRO_VFS_STAT_IS_CHARACTER_SPECIAL) != 0;
94+
if (path_stat64_cb)
95+
return (path_stat64_cb(path, NULL) & RETRO_VFS_STAT_IS_CHARACTER_SPECIAL) != 0;
96+
return (path_stat32_cb(path, NULL) & RETRO_VFS_STAT_IS_CHARACTER_SPECIAL) != 0;
8597
}
8698

8799
bool path_is_valid(const char *path)
88100
{
89-
return (path_stat_cb(path, NULL) & RETRO_VFS_STAT_IS_VALID) != 0;
101+
if (path_stat64_cb)
102+
return (path_stat64_cb(path, NULL) & RETRO_VFS_STAT_IS_VALID) != 0;
103+
return (path_stat32_cb(path, NULL) & RETRO_VFS_STAT_IS_VALID) != 0;
90104
}
91105

92-
int32_t path_get_size(const char *path)
106+
int64_t path_get_size(const char *path)
93107
{
94-
int32_t filesize = 0;
95-
if (path_stat_cb(path, &filesize) != 0)
108+
int64_t filesize = 0;
109+
int32_t filesize32 = 0;
110+
111+
if (path_stat64_cb && path_stat64_cb(path, &filesize) != 0)
96112
return filesize;
97113

114+
/* Fallback: 32-bit stat */
115+
if (path_stat32_cb && path_stat32_cb(path, &filesize32) != 0)
116+
return (int64_t)filesize32;
117+
98118
return -1;
99119
}
100120

‎libretro-common/formats/logiqx_dat/logiqx_dat.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const char *logiqx_dat_html_code_list[][2] = {
5757
bool logiqx_dat_path_is_valid(const char *path, uint64_t *file_size)
5858
{
5959
const char *file_ext = NULL;
60-
int32_t file_size_int;
60+
int64_t file_size_int;
6161

6262
if (string_is_empty(path))
6363
return false;

‎libretro-common/include/file/file_path.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
RETRO_BEGIN_DECLS
3737

3838
#define PATH_REQUIRED_VFS_VERSION 3
39+
#define STAT64_REQUIRED_VFS_VERSION 4
3940

4041
void path_vfs_init(const struct retro_vfs_interface_info* vfs_info);
4142

@@ -681,7 +682,7 @@ int path_stat(const char *path);
681682

682683
bool path_is_valid(const char *path);
683684

684-
int32_t path_get_size(const char *path);
685+
int64_t path_get_size(const char *path);
685686

686687
bool is_path_accessible_using_standard_io(const char *path);
687688

‎libretro-common/include/libretro.h‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2935,6 +2935,19 @@ typedef int (RETRO_CALLCONV *retro_vfs_rename_t)(const char *old_path, const cha
29352935
*/
29362936
typedef int (RETRO_CALLCONV *retro_vfs_stat_t)(const char *path, int32_t *size);
29372937

2938+
/**
2939+
* Gets information about the given file (64-bit size).
2940+
*
2941+
* @param path The path to the file to query.
2942+
* @param[out] size The reported size of the file in bytes.
2943+
* May be \c NULL, in which case this value is ignored.
2944+
* @return A bitmask of \c RETRO_VFS_STAT flags,
2945+
* or 0 if \c path doesn't refer to a valid file.
2946+
* @see RETRO_VFS_STAT
2947+
* @since VFS API v4
2948+
*/
2949+
typedef int (RETRO_CALLCONV *retro_vfs_stat_64_t)(const char *path, int64_t *size);
2950+
29382951
/**
29392952
* Creates a directory at the given path.
29402953
*
@@ -3090,6 +3103,10 @@ struct retro_vfs_interface
30903103

30913104
/** @copydoc retro_vfs_closedir_t */
30923105
retro_vfs_closedir_t closedir;
3106+
3107+
/* VFS API v4 */
3108+
/** @copydoc retro_vfs_stat_64_t */
3109+
retro_vfs_stat_64_t stat_64;
30933110
};
30943111

30953112
/**

‎libretro-common/include/vfs/vfs_implementation.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ const char *retro_vfs_file_get_path_impl(libretro_vfs_implementation_file *strea
5959

6060
int retro_vfs_stat_impl(const char *path, int32_t *size);
6161

62+
int retro_vfs_stat_64_impl(const char *path, int64_t *size);
63+
6264
int retro_vfs_mkdir_impl(const char *dir);
6365

6466
libretro_vfs_implementation_dir *retro_vfs_opendir_impl(const char *dir, bool include_hidden);

‎libretro-common/include/vfs/vfs_implementation_saf.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ int retro_vfs_file_remove_saf(const char *tree, const char *path);
9191

9292
int retro_vfs_file_rename_saf(const char *old_tree, const char *old_path, const char *new_tree, const char *new_path);
9393

94-
int retro_vfs_stat_saf(const char *tree, const char *path, int32_t *size);
94+
int retro_vfs_stat_saf(const char *tree, const char *path, int64_t *size);
9595

9696
int retro_vfs_mkdir_saf(const char *tree, const char *dir);
9797

‎libretro-common/vfs/vfs_implementation.c‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,7 +1009,7 @@ const char *retro_vfs_file_get_path_impl(
10091009
return stream->orig_path;
10101010
}
10111011

1012-
int retro_vfs_stat_impl(const char *path, int32_t *size)
1012+
int retro_vfs_stat_64_impl(const char *path, int64_t *size)
10131013
{
10141014
int ret = RETRO_VFS_STAT_IS_VALID;
10151015

@@ -1049,7 +1049,7 @@ int retro_vfs_stat_impl(const char *path, int32_t *size)
10491049
return 0;
10501050

10511051
if (size)
1052-
*size = (int32_t)stat_buf.st_size;
1052+
*size = (int64_t)stat_buf.st_size;
10531053

10541054
if (FIO_S_ISDIR(stat_buf.st_mode))
10551055
ret |= RETRO_VFS_STAT_IS_DIRECTORY;
@@ -1061,15 +1061,15 @@ int retro_vfs_stat_impl(const char *path, int32_t *size)
10611061
return 0;
10621062

10631063
if (size)
1064-
*size = (int32_t)stat_buf.st_size;
1064+
*size = (int64_t)stat_buf.st_size;
10651065

10661066
if ((stat_buf.st_mode & S_IFMT) == S_IFDIR)
10671067
ret |= RETRO_VFS_STAT_IS_DIRECTORY;
10681068
#elif defined(_WIN32)
10691069
/* Windows
10701070
* Older MSVC _stat may fail on directory paths
10711071
* with a trailing backslash */
1072-
struct _stat stat_buf;
1072+
struct _stat64 stat_buf;
10731073
char path_buf[PATH_MAX_LENGTH];
10741074
const char *stat_path = path;
10751075
size_t _len = strlcpy(path_buf, path, sizeof(path_buf));
@@ -1118,7 +1118,7 @@ int retro_vfs_stat_impl(const char *path, int32_t *size)
11181118
file_info = GetFileAttributesW(path_wide);
11191119

11201120
if (file_info == INVALID_FILE_ATTRIBUTES
1121-
|| _wstat(path_wide, &stat_buf) != 0)
1121+
|| _wstat64(path_wide, &stat_buf) != 0)
11221122
{
11231123
free(path_wide);
11241124
return 0;
@@ -1128,7 +1128,7 @@ int retro_vfs_stat_impl(const char *path, int32_t *size)
11281128
#endif
11291129

11301130
if (size)
1131-
*size = (int32_t)stat_buf.st_size;
1131+
*size = (int64_t)stat_buf.st_size;
11321132

11331133
if (file_info & FILE_ATTRIBUTE_DIRECTORY)
11341134
ret |= RETRO_VFS_STAT_IS_DIRECTORY;
@@ -1148,21 +1148,27 @@ int retro_vfs_stat_impl(const char *path, int32_t *size)
11481148
return 0;
11491149

11501150
if (size)
1151-
*size = (int32_t)stat_buf.st_size;
1151+
*size = (int64_t)stat_buf.st_size;
11521152

11531153
if (S_ISDIR(stat_buf.st_mode))
11541154
ret |= RETRO_VFS_STAT_IS_DIRECTORY;
11551155
if (S_ISCHR(stat_buf.st_mode))
11561156
ret |= RETRO_VFS_STAT_IS_CHARACTER_SPECIAL;
11571157
#else
11581158
/* Every other platform */
1159+
#if defined(_LARGEFILE64_SOURCE)
1160+
struct stat64 stat_buf;
1161+
if (stat64(path, &stat_buf) < 0)
1162+
return 0;
1163+
#else
11591164
struct stat stat_buf;
11601165

11611166
if (stat(path, &stat_buf) < 0)
11621167
return 0;
1168+
#endif
11631169

11641170
if (size)
1165-
*size = (int32_t)stat_buf.st_size;
1171+
*size = (int64_t)stat_buf.st_size;
11661172

11671173
if (S_ISDIR(stat_buf.st_mode))
11681174
ret |= RETRO_VFS_STAT_IS_DIRECTORY;
@@ -1173,6 +1179,21 @@ int retro_vfs_stat_impl(const char *path, int32_t *size)
11731179
return ret;
11741180
}
11751181

1182+
int retro_vfs_stat_impl(const char *path, int32_t *size)
1183+
{
1184+
int64_t size64 = 0;
1185+
int ret = retro_vfs_stat_64_impl(path, size ? &size64 : NULL);
1186+
1187+
/* if a file is larger than 2 GB, size64 will hold the correct value
1188+
* but the cast to int32_t will truncate it.
1189+
* new code should migrate to retro_vfs_stat_64_t
1190+
*/
1191+
if (size)
1192+
*size = (int32_t)size64;
1193+
1194+
return ret;
1195+
}
1196+
11761197
#if defined(VITA)
11771198
#define path_mkdir_err(ret) (((ret) == SCE_ERROR_ERRNO_EEXIST))
11781199
#elif defined(PSP) || defined(PS2) || defined(_3DS) || defined(WIIU) || defined(SWITCH)
@@ -1499,7 +1520,7 @@ bool retro_vfs_dirent_is_dir_impl(libretro_vfs_implementation_dir *rdir)
14991520
{
15001521
char full[PATH_MAX_LENGTH];
15011522
const char *name = retro_vfs_dirent_get_name_impl(rdir);
1502-
int32_t sz = 0;
1523+
int64_t sz = 0;
15031524
int st = 0;
15041525

15051526
if (!name)

‎libretro-common/vfs/vfs_implementation_saf.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ int retro_vfs_file_rename_saf(const char *old_tree, const char *old_path, const
620620
return -1;
621621
}
622622

623-
int retro_vfs_stat_saf(const char *tree, const char *path, int32_t *size)
623+
int retro_vfs_stat_saf(const char *tree, const char *path, int64_t *size)
624624
{
625625
JNIEnv *env;
626626
jstring tree_object;
@@ -677,7 +677,7 @@ int retro_vfs_stat_saf(const char *tree, const char *path, int32_t *size)
677677
if ((*env)->ExceptionOccurred(env)) goto error;
678678

679679
if (size != NULL)
680-
*size = saf_stat_size > INT32_MAX ? INT32_MAX : (int32_t)saf_stat_size;
680+
*size = saf_stat_size > INT64_MAX ? INT64_MAX : (int64_t)saf_stat_size;
681681

682682
(*env)->PopLocalFrame(env, NULL);
683683
return saf_stat_is_directory ? RETRO_VFS_STAT_IS_VALID | RETRO_VFS_STAT_IS_DIRECTORY : RETRO_VFS_STAT_IS_VALID;

‎libretro-common/vfs/vfs_implementation_smb.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ int retro_vfs_closedir_smb(smb_dir_handle* dh)
544544
return 0;
545545
}
546546

547-
int retro_vfs_stat_smb(const char *path, int32_t *size)
547+
int retro_vfs_stat_smb(const char *path, int64_t *size)
548548
{
549549
char rel_path[PATH_MAX_LENGTH];
550550
struct smb2_stat_64 st;
@@ -572,7 +572,7 @@ int retro_vfs_stat_smb(const char *path, int32_t *size)
572572
return 0;
573573

574574
if (size)
575-
*size = (int32_t)st.smb2_size;
575+
*size = (int64_t)st.smb2_size;
576576

577577
return RETRO_VFS_STAT_IS_VALID |
578578
(st.smb2_type == SMB2_TYPE_DIRECTORY ? RETRO_VFS_STAT_IS_DIRECTORY : 0);

‎libretro-common/vfs/vfs_implementation_smb.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ struct smbc_dirent* retro_vfs_readdir_smb(smb_dir_handle* dh);
6060
int retro_vfs_closedir_smb(smb_dir_handle* dh);
6161

6262
/* Stat */
63-
int retro_vfs_stat_smb(const char *path, int32_t *size);
63+
int retro_vfs_stat_smb(const char *path, int64_t *size);
6464

6565
/* Errors */
6666
int retro_vfs_file_error_smb(libretro_vfs_implementation_file *stream);

0 commit comments

Comments
 (0)