eaw/Main
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

One more fix for getting file size.

Browse Source
This commit is contained in:
sorgelig
2019-05-26 18:37:51 +08:00
parent e4241f3dbf
commit 7c2733de69
1 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
file_io.cpp
View File

@@ -322,20 +322,21 @@ int FileOpenEx(fileTYPE *file, const char *name, int mode, char mute)
FileClose(file);
return 0;
}
if ((st.st_rdev != 0) && (st.st_size == 0)) //for special files we need an ioctl call to get the correct size
{
unsigned long long blksize;
int ret = ioctl(fd, BLKGETSIZE64, &blksize);
if (ret < 0 )
{
if (!mute) printf("FileOpenEx(ioctl) File:%s, error: %d.\n", full_path, ret);
FileClose(file);
return 0;
}
file->size = blksize;
}
else
file->size = st.st_size;
file->size = st.st_size;
if (st.st_rdev && !st.st_size) //for special files we need an ioctl call to get the correct size
{
unsigned long long blksize;
int ret = ioctl(fd, BLKGETSIZE64, &blksize);
if (ret < 0)
{
if (!mute) printf("FileOpenEx(ioctl) File:%s, error: %d.\n", full_path, ret);
FileClose(file);
return 0;
}
file->size = blksize;
}
file->offset = 0;
file->mode = mode;
}
@@ -350,8 +351,17 @@ __off64_t FileGetSize(fileTYPE *file)
if (file->filp)
{
struct stat64 st;
int ret = fstat64(fileno(file->filp), &st);
return (ret < 0) ? 0 : st.st_size;
if (fstat64(fileno(file->filp), &st) < 0) return 0;
if (st.st_rdev && !st.st_size) //for special files we need an ioctl call to get the correct size
{
unsigned long long blksize;
int ret = ioctl(fileno(file->filp), BLKGETSIZE64, &blksize);
if (ret < 0) return 0;
return blksize;
}
return st.st_size;
}
else if (file->zip)
{