libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(retro_file.c) Get rid of uneeded error messages in retro_read_file()

Browse Source 
fseek/ftell lie about the file size in some filesystems (like sysfs) and
this makes the function complain about incomplete read when the file has
been fully read.
This commit is contained in:
Higor Eurípedes 2015-12-23 21:20:26 -03:00
parent 9cf654367a
commit 5cbcd90707
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libretro-common/file/retro_file.c
View File

@ -454,7 +454,10 @@ int retro_read_file(const char *path, void **buf, ssize_t *len)
RFILE *file = retro_fopen(path, RFILE_MODE_READ, -1);
if (!file)
{
fprintf(stderr, "%s: Failed to open %s: %s\n", __FUNCTION__, path, strerror(errno));
goto error;
}
if (retro_fseek(file, 0, SEEK_END) != 0)
goto error;
@ -470,11 +473,14 @@ int retro_read_file(const char *path, void **buf, ssize_t *len)
if (!content_buf)
goto error;
if ((ret = retro_fread(file, content_buf, content_buf_size)) < content_buf_size)
printf("Didn't read whole file: %s.\n", path);
if (!content_buf)
ret = retro_fread(file, content_buf, content_buf_size);
if (ret < 0)
{
fprintf(stderr, "%s: Failed to read %s: %s\n", __FUNCTION__, path, strerror(errno));
goto error;
}
retro_fclose(file);
*buf = content_buf;
@ -482,16 +488,14 @@ int retro_read_file(const char *path, void **buf, ssize_t *len)
* Will only work with sane character formatting (Unix). */
((char*)content_buf)[content_buf_size] = '\0';
if (retro_fclose(file) != 0)
printf("Failed to close file stream.\n");
if (len)
*len = ret;
return 1;
error:
retro_fclose(file);
if (file)
retro_fclose(file);
if (content_buf)
free(content_buf);
if (len)