return 0 (meaning the file is not seekable, as the docs now explain) instead of 4KB for the files in sysfs under Linux (#9965)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-09-19 08:11:44 +00:00
parent f915b92e09
commit 41f6f17d01
2 changed files with 21 additions and 0 deletions

View File

@@ -82,6 +82,12 @@ public:
/** /**
Returns the length of the file. Returns the length of the file.
This method may return wxInvalidOffset if the length couldn't be
determined or also 0 even for non-empty files if the file is not
seekable. In general, the only way to determine if the file for which
this function returns 0 is really empty or not is to try reading from
it.
*/ */
wxFileOffset Length() const; wxFileOffset Length() const;

View File

@@ -393,6 +393,21 @@ wxFileOffset wxFile::Length() const
{ {
wxASSERT( IsOpened() ); wxASSERT( IsOpened() );
// we use a special method for Linux systems where files in sysfs (i.e.
// those under /sys typically) return length of 4096 bytes even when
// they're much smaller -- this is a problem as it results in errors later
// when we try reading 4KB from them
#ifdef __LINUX__
struct stat st;
if ( fstat(m_fd, &st) == 0 )
{
// returning 0 for the special files indicates to the caller that they
// are not seekable
return st.st_blocks ? st.st_size : 0;
}
//else: failed to stat, try the normal method
#endif // __LINUX__
wxFileOffset iRc = Tell(); wxFileOffset iRc = Tell();
if ( iRc != wxInvalidOffset ) { if ( iRc != wxInvalidOffset ) {
// have to use const_cast :-( // have to use const_cast :-(