Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ReaderImplBase::Init(): Make file size check optional

Browse Source 
If the file doesn't support GetSize(), skip the header total size file
size check.
This commit is contained in:
Ingo Weinhold 2014-07-13 01:08:53 +02:00
parent 05b565f4f2
commit 1606450b32
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
headers/private/package/hpkg/ReaderImplBase.h
View File

@ -439,9 +439,16 @@ ReaderImplBase::Init(BPositionIO* file, bool keepFile, Header& header, uint32 fl
off_t fileSize;
error = fFile->GetSize(&fileSize);
if (error != B_OK) {
ErrorOutput()->PrintError("Error: Failed to get size of %s file: %s\n",
fFileType, strerror(error));
return errno;
if (error != B_NOT_SUPPORTED) {
ErrorOutput()->PrintError(
"Error: Failed to get size of %s file: %s\n",
fFileType, strerror(error));
return error;
}
// Might be a stream. We only use the file size for checking the total
// heap size, which we don't have to do.
fileSize = -1;
}
// read the header
@ -480,7 +487,7 @@ ReaderImplBase::Init(BPositionIO* file, bool keepFile, Header& header, uint32 fl
// total size
uint64 totalSize = B_BENDIAN_TO_HOST_INT64(header.total_size);
if (totalSize != (uint64)fileSize) {
if (fileSize >= 0 && totalSize != (uint64)fileSize) {
ErrorOutput()->PrintError("Error: Invalid %s file: Total size in "
"header (%" B_PRIu64 ") doesn't agree with total file size (%"
B_PRIdOFF ")\n", fFileType, totalSize, fileSize);