mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-25 11:26:37 +00:00
Code Issues Releases Wiki Activity

Merge pull request #851 from cfcohen/errno

Browse source 
Improved error reporting under POSIX using errno and strerror().
This commit is contained in:
scrawl 2015-12-09 14:10:19 +01:00
commit 0dd4adb88c
1 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
components/files/lowlevelfile.cpp
View file

@ -8,6 +8,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h>
#include <string.h>
#endif #endif
#if FILE_API == FILE_API_STDIO #if FILE_API == FILE_API_STDIO
@ -139,7 +141,7 @@ void LowLevelFile::open (char const * filename)
if (mHandle == -1) if (mHandle == -1)
{ {
std::ostringstream os; std::ostringstream os;
os << "Failed to open '" << filename << "' for reading."; os << "Failed to open '" << filename << "' for reading: " << strerror(errno);
throw std::runtime_error (os.str ()); throw std::runtime_error (os.str ());
} }
} }
@ -160,15 +162,27 @@ size_t LowLevelFile::size ()
size_t oldPosition = ::lseek (mHandle, 0, SEEK_CUR); size_t oldPosition = ::lseek (mHandle, 0, SEEK_CUR);
if (oldPosition == size_t (-1)) if (oldPosition == size_t (-1))
throw std::runtime_error ("A query operation on a file failed."); {
std::ostringstream os;
os << "An lseek() call failed:" << strerror(errno);
throw std::runtime_error (os.str ());
}
size_t Size = ::lseek (mHandle, 0, SEEK_END); size_t Size = ::lseek (mHandle, 0, SEEK_END);
if (Size == size_t (-1)) if (Size == size_t (-1))
throw std::runtime_error ("A query operation on a file failed."); {
std::ostringstream os;
os << "An lseek() call failed:" << strerror(errno);
throw std::runtime_error (os.str ());
}
if (lseek (mHandle, oldPosition, SEEK_SET) == -1) if (lseek (mHandle, oldPosition, SEEK_SET) == -1)
throw std::runtime_error ("A query operation on a file failed."); {
std::ostringstream os;
os << "An lseek() call failed:" << strerror(errno);
throw std::runtime_error (os.str ());
}
return Size; return Size;
} }
@ -178,7 +192,11 @@ void LowLevelFile::seek (size_t Position)
assert (mHandle != -1); assert (mHandle != -1);
if (::lseek (mHandle, Position, SEEK_SET) == -1) if (::lseek (mHandle, Position, SEEK_SET) == -1)
throw std::runtime_error ("A seek operation on a file failed."); {
std::ostringstream os;
os << "An lseek() call failed:" << strerror(errno);
throw std::runtime_error (os.str ());
}
} }
size_t LowLevelFile::tell () size_t LowLevelFile::tell ()
@ -188,7 +206,11 @@ size_t LowLevelFile::tell ()
size_t Position = ::lseek (mHandle, 0, SEEK_CUR); size_t Position = ::lseek (mHandle, 0, SEEK_CUR);
if (Position == size_t (-1)) if (Position == size_t (-1))
throw std::runtime_error ("A query operation on a file failed."); {
std::ostringstream os;
os << "An lseek() call failed:" << strerror(errno);
throw std::runtime_error (os.str ());
}
return Position; return Position;
} }
@ -200,7 +222,11 @@ size_t LowLevelFile::read (void * data, size_t size)
int amount = ::read (mHandle, data, size); int amount = ::read (mHandle, data, size);
if (amount == -1) if (amount == -1)
throw std::runtime_error ("A read operation on a file failed."); {
std::ostringstream os;
os << "An attempt to read " << size << "bytes failed:" << strerror(errno);
throw std::runtime_error (os.str ());
}
return amount; return amount;
} }