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

Switch package file accessor classes to use BPositionIO

Browse Source 
* PackageFileHeap{Reader,Writer} as well as Package{Reader,Writer} and
  their implementation and super classes do now internally use a
  BPositionIO instead of a FD to access the package file. This provides
  more flexibility needed for features to come.
* BPackageReader has already grown a new Init() version with a
  BPositionIO* parameter.
This commit is contained in:
Ingo Weinhold 2014-07-12 13:34:56 +02:00
parent 01e6d687c0
commit e527b79631
21 changed files with 205 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
headers/os/package/hpkg/PackageReader.h
View File

@ -9,6 +9,9 @@
#include <SupportDefs.h>
class BPositionIO;
namespace BPackageKit {
namespace BHPKG {
@ -34,12 +37,14 @@ public:
status_t Init(const char* fileName, uint32 flags = 0);
status_t Init(int fd, bool keepFD, uint32 flags = 0);
status_t Init(BPositionIO* file, bool keepFile,
uint32 flags = 0);
status_t ParseContent(
BPackageContentHandler* contentHandler);
status_t ParseContent(BLowLevelPackageContentHandler*
contentHandler);
int PackageFileFD();
BPositionIO* PackageFile() const;
BAbstractBufferedDataReader* HeapReader() const;
// Only valid as long as the reader lives.

10
headers/private/package/hpkg/PackageFileHeapAccessorBase.h
View File

@ -71,8 +71,8 @@ public:
public:
PackageFileHeapAccessorBase(
BErrorOutput* errorOutput, int fd,
off_t heapOffset,
BErrorOutput* errorOutput,
BPositionIO* file, off_t heapOffset,
DecompressionAlgorithmOwner*
decompressionAlgorithm);
virtual ~PackageFileHeapAccessorBase();
@ -89,8 +89,8 @@ public:
// normally used after cloning a PackageFileHeapReader only
void SetErrorOutput(BErrorOutput* errorOutput)
{ fErrorOutput = errorOutput; }
void SetFD(int fd)
{ fFD = fd; }
void SetFile(BPositionIO* file)
{ fFile = file; }
uint64 HeapOverhead(uint64 uncompressedSize) const;
// additional bytes needed when storing
@ -122,7 +122,7 @@ protected:
protected:
BErrorOutput* fErrorOutput;
int fFD;
BPositionIO* fFile;
off_t fHeapOffset;
uint64 fCompressedHeapSize;
uint64 fUncompressedHeapSize;

2
headers/private/package/hpkg/PackageFileHeapReader.h
View File

@ -25,7 +25,7 @@ namespace BPrivate {
class PackageFileHeapReader : public PackageFileHeapAccessorBase {
public:
PackageFileHeapReader(BErrorOutput* errorOutput,
int fd, off_t heapOffset,
BPositionIO* file, off_t heapOffset,
off_t compressedHeapSize,
uint64 uncompressedHeapSize,
DecompressionAlgorithmOwner*

2
headers/private/package/hpkg/PackageFileHeapWriter.h
View File

@ -35,7 +35,7 @@ class PackageFileHeapReader;
class PackageFileHeapWriter : public PackageFileHeapAccessorBase {
public:
PackageFileHeapWriter(BErrorOutput* errorOutput,
int fd, off_t heapOffset,
BPositionIO* file, off_t heapOffset,
CompressionAlgorithmOwner*
compressionAlgorithm,
DecompressionAlgorithmOwner*

10
headers/private/package/hpkg/PackageReaderImpl.h
View File

@ -33,12 +33,14 @@ public:
status_t Init(const char* fileName, uint32 flags);
status_t Init(int fd, bool keepFD, uint32 flags);
status_t Init(BPositionIO* file, bool keepFile,
uint32 flags);
status_t ParseContent(
BPackageContentHandler* contentHandler);
status_t ParseContent(BLowLevelPackageContentHandler*
contentHandler);
int PackageFileFD() const;
BPositionIO* PackageFile() const;
uint64 HeapOffset() const;
uint64 HeapSize() const;
@ -77,10 +79,10 @@ private:
};
inline int
PackageReaderImpl::PackageFileFD() const
inline BPositionIO*
PackageReaderImpl::PackageFile() const
{
return FD();
return File();
}

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

@ -1,5 +1,5 @@
/*
* Copyright 2009-2013, Ingo Weinhold, ingo_weinhold@gmx.de.
* Copyright 2009-2014, Ingo Weinhold, ingo_weinhold@gmx.de.
* Copyright 2011, Oliver Tappe <zooey@hirschkaefer.de>
* Distributed under the terms of the MIT License.
*/
@ -11,7 +11,7 @@
#include <sys/stat.h>
#include <ByteOrder.h>
#include <SupportDefs.h>
#include <DataIO.h>
#include <Array.h>
#include <util/SinglyLinkedList.h>
@ -77,7 +77,7 @@ protected:
BErrorOutput* errorOutput);
virtual ~ReaderImplBase();
int FD() const;
BPositionIO* File() const;
BErrorOutput* ErrorOutput() const;
@ -93,14 +93,14 @@ protected:
// equals RawHeapReader(), if uncached
BAbstractBufferedDataReader* DetachHeapReader(
PackageFileHeapReader** _rawHeapReader
= NULL);
PackageFileHeapReader*& _rawHeapReader);
// Detaches both raw and (if applicable)
// cached heap reader. The called gains
// ownership. The FD may need to be set on
// the raw heap reader, if it shall be used
// after destroying this object and Init()
// has been called with keepFD == true.
// ownership of both. The file may need to
// be set on the raw heap reader, if it
// shall be used after destroying this
// object and Init() has been called with
// keepFile == true.
protected:
class AttributeHandlerContext;
@ -122,8 +122,8 @@ protected:
protected:
template<typename Header, uint32 kMagic, uint16 kVersion,
uint16 kMinorVersion>
status_t Init(int fd, bool keepFD, Header& header,
uint32 flags);
status_t Init(BPositionIO* file, bool keepFile,
Header& header, uint32 flags);
status_t InitHeapReader(uint32 compression,
uint32 chunkSize, off_t offset,
uint64 compressedSize,
@ -169,7 +169,7 @@ protected:
PackageFileSection fPackageAttributesSection;
private:
status_t _Init(int fd, bool keepFD);
status_t _Init(BPositionIO* file, bool keepFile);
status_t _ParseAttributeTree(
AttributeHandlerContext* context);
@ -190,8 +190,8 @@ private:
private:
const char* fFileType;
BErrorOutput* fErrorOutput;
int fFD;
bool fOwnsFD;
BPositionIO* fFile;
bool fOwnsFile;
uint16 fMinorFormatVersion;
uint16 fCurrentMinorFormatVersion;
@ -429,17 +429,18 @@ private:
template<typename Header, uint32 kMagic, uint16 kVersion, uint16 kMinorVersion>
status_t
ReaderImplBase::Init(int fd, bool keepFD, Header& header, uint32 flags)
ReaderImplBase::Init(BPositionIO* file, bool keepFile, Header& header, uint32 flags)
{
status_t error = _Init(fd, keepFD);
status_t error = _Init(file, keepFile);
if (error != B_OK)
return error;
// stat the file
struct stat st;
if (fstat(FD(), &st) < 0) {
ErrorOutput()->PrintError("Error: Failed to access %s file: %s\n",
fFileType, strerror(errno));
// get the file size
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;
}
@ -479,10 +480,10 @@ ReaderImplBase::Init(int fd, bool keepFD, Header& header, uint32 flags)
// total size
uint64 totalSize = B_BENDIAN_TO_HOST_INT64(header.total_size);
if (totalSize != (uint64)st.st_size) {
if (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, st.st_size);
B_PRIdOFF ")\n", fFileType, totalSize, fileSize);
return B_BAD_DATA;
}
@ -510,10 +511,10 @@ ReaderImplBase::Init(int fd, bool keepFD, Header& header, uint32 flags)
}
inline int
ReaderImplBase::FD() const
inline BPositionIO*
ReaderImplBase::File() const
{
return fFD;
return fFile;
}

1
headers/private/package/hpkg/RepositoryReaderImpl.h
View File

@ -30,6 +30,7 @@ public:
status_t Init(const char* fileName);
status_t Init(int fd, bool keepFD);
status_t Init(BPositionIO* file, bool keepFile);
status_t GetRepositoryInfo(
BRepositoryInfo* _repositoryInfo) const;

10
headers/private/package/hpkg/WriterImplBase.h
View File

@ -149,7 +149,7 @@ protected:
off_t offset);
// writes to the file directly
inline int FD() const;
inline BPositionIO* File() const;
inline uint32 Flags() const;
inline const BPackageWriterParameters& Parameters() const;
@ -187,7 +187,7 @@ private:
BErrorOutput* fErrorOutput;
const char* fFileName;
BPackageWriterParameters fParameters;
int fFD;
BPositionIO* fFile;
bool fFinished;
StringCache fPackageStringCache;
@ -217,10 +217,10 @@ WriterImplBase::WriteBuffer(const void* data, size_t size)
}
inline int
WriterImplBase::FD() const
inline BPositionIO*
WriterImplBase::File() const
{
return fFD;
return fFile;
}

7
src/add-ons/kernel/file_systems/packagefs/Jamfile
View File

@ -110,6 +110,10 @@ local libSharedSources =
NaturalCompare.cpp
;
local storageKitSources =
FdIO.cpp
;
local supportKitSources =
CompressionAlgorithm.cpp
ZlibCompressionAlgorithm.cpp
@ -122,6 +126,7 @@ KernelAddon packagefs
$(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES)
$(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1)
$(libSharedSources)
$(storageKitSources)
$(supportKitSources)
: $(TARGET_KERNEL_LIBSUPC++) kernel_libz.a
@ -136,5 +141,7 @@ SEARCH on [ FGristFiles $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1) ]
+= [ FDirName $(HAIKU_TOP) src kits package hpkg v1 ] ;
SEARCH on [ FGristFiles $(libSharedSources) ]
+= [ FDirName $(HAIKU_TOP) src kits shared ] ;
SEARCH on [ FGristFiles $(storageKitSources) ]
+= [ FDirName $(HAIKU_TOP) src kits storage ] ;
SEARCH on [ FGristFiles $(supportKitSources) ]
+= [ FDirName $(HAIKU_TOP) src kits support ] ;

28
src/add-ons/kernel/file_systems/packagefs/package/Package.cpp
View File

@ -20,6 +20,7 @@
#include <package/hpkg/v1/PackageEntryAttribute.h>
#include <AutoDeleter.h>
#include <FdIO.h>
#include <package/hpkg/PackageFileHeapReader.h>
#include <package/hpkg/PackageReaderImpl.h>
#include <package/hpkg/v1/PackageReaderImpl.h>
@ -687,7 +688,7 @@ private:
struct Package::HeapReaderV2 : public HeapReader, public CachedDataReader,
private BErrorOutput {
private BErrorOutput, private BFdIO {
public:
HeapReaderV2()
:
@ -706,8 +707,10 @@ public:
if (fHeapReader == NULL)
return B_NO_MEMORY;
BFdIO::SetTo(fd, false);
fHeapReader->SetErrorOutput(this);
fHeapReader->SetFD(fd);
fHeapReader->SetFile(this);
status_t error = CachedDataReader::Init(fHeapReader,
fHeapReader->UncompressedHeapSize());
@ -719,7 +722,7 @@ public:
virtual void UpdateFD(int fd)
{
fHeapReader->SetFD(fd);
BFdIO::SetTo(fd, false);
}
virtual status_t CreateDataReader(const PackageData& data,
@ -749,7 +752,8 @@ struct Package::CachingPackageReader : public PackageReaderImpl {
CachingPackageReader(BErrorOutput* errorOutput)
:
PackageReaderImpl(errorOutput),
fCachedHeapReader(NULL)
fCachedHeapReader(NULL),
fFD(-1)
{
}
@ -757,6 +761,12 @@ struct Package::CachingPackageReader : public PackageReaderImpl {
{
}
status_t Init(int fd, bool keepFD, uint32 flags)
{
fFD = fd;
return PackageReaderImpl::Init(fd, keepFD, flags);
}
virtual status_t CreateCachedHeapReader(
PackageFileHeapReader* rawHeapReader,
BAbstractBufferedDataReader*& _cachedReader)
@ -765,7 +775,7 @@ struct Package::CachingPackageReader : public PackageReaderImpl {
if (fCachedHeapReader == NULL)
RETURN_ERROR(B_NO_MEMORY);
status_t error = fCachedHeapReader->Init(rawHeapReader, FD());
status_t error = fCachedHeapReader->Init(rawHeapReader, fFD);
if (error != B_OK)
RETURN_ERROR(error);
@ -775,7 +785,12 @@ struct Package::CachingPackageReader : public PackageReaderImpl {
HeapReaderV2* DetachCachedHeapReader()
{
DetachHeapReader();
PackageFileHeapReader* rawHeapReader;
DetachHeapReader(rawHeapReader);
// We don't need the raw heap reader anymore, since the cached reader
// is not a wrapper around it, but completely independent from it.
delete rawHeapReader;
HeapReaderV2* cachedHeapReader = fCachedHeapReader;
fCachedHeapReader = NULL;
@ -784,6 +799,7 @@ struct Package::CachingPackageReader : public PackageReaderImpl {
private:
HeapReaderV2* fCachedHeapReader;
int fFD;
};

19
src/kits/package/hpkg/PackageFileHeapAccessorBase.cpp
View File

@ -6,7 +6,6 @@
#include <package/hpkg/PackageFileHeapAccessorBase.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
@ -122,11 +121,11 @@ PackageFileHeapAccessorBase::OffsetArray::Init(size_t totalChunkCount,
PackageFileHeapAccessorBase::PackageFileHeapAccessorBase(
BErrorOutput* errorOutput, int fd, off_t heapOffset,
BErrorOutput* errorOutput, BPositionIO* file, off_t heapOffset,
DecompressionAlgorithmOwner* decompressionAlgorithm)
:
fErrorOutput(errorOutput),
fFD(fd),
fFile(file),
fHeapOffset(heapOffset),
fCompressedHeapSize(0),
fUncompressedHeapSize(0),
@ -252,16 +251,12 @@ status_t
PackageFileHeapAccessorBase::ReadFileData(uint64 offset, void* buffer,
size_t size)
{
ssize_t bytesRead = pread(fFD, buffer, size, fHeapOffset + (off_t)offset);
if (bytesRead < 0) {
status_t error = fFile->ReadAtExactly(fHeapOffset + (off_t)offset, buffer,
size);
if (error != B_OK) {
fErrorOutput->PrintError("ReadFileData(%" B_PRIu64 ", %p, %zu) failed "
"to read data: %s\n", offset, buffer, size, strerror(errno));
return errno;
}
if ((size_t)bytesRead != size) {
fErrorOutput->PrintError("ReadFileData(%" B_PRIu64 ", %p, %zu) could "
"read only %zd bytes\n", offset, buffer, size, bytesRead);
return B_ERROR;
"to read data: %s\n", offset, buffer, size, strerror(error));
return error;
}
return B_OK;

9
src/kits/package/hpkg/PackageFileHeapReader.cpp
View File

@ -23,11 +23,12 @@ namespace BHPKG {
namespace BPrivate {
PackageFileHeapReader::PackageFileHeapReader(BErrorOutput* errorOutput, int fd,
off_t heapOffset, off_t compressedHeapSize, uint64 uncompressedHeapSize,
PackageFileHeapReader::PackageFileHeapReader(BErrorOutput* errorOutput,
BPositionIO* file, off_t heapOffset, off_t compressedHeapSize,
uint64 uncompressedHeapSize,
DecompressionAlgorithmOwner* decompressionAlgorithm)
:
PackageFileHeapAccessorBase(errorOutput, fd, heapOffset,
PackageFileHeapAccessorBase(errorOutput, file, heapOffset,
decompressionAlgorithm),
fOffsets()
{
@ -118,7 +119,7 @@ PackageFileHeapReader*
PackageFileHeapReader::Clone() const
{
PackageFileHeapReader* clone = new(std::nothrow) PackageFileHeapReader(
fErrorOutput, fFD, fHeapOffset, fCompressedHeapSize,
fErrorOutput, fFile, fHeapOffset, fCompressedHeapSize,
fUncompressedHeapSize, fDecompressionAlgorithm);
if (clone == NULL)
return NULL;

25
src/kits/package/hpkg/PackageFileHeapWriter.cpp
View File

@ -6,8 +6,6 @@
#include <package/hpkg/PackageFileHeapWriter.h>
#include <errno.h>
#include <algorithm>
#include <new>
@ -196,11 +194,12 @@ private:
};
PackageFileHeapWriter::PackageFileHeapWriter(BErrorOutput* errorOutput, int fd,
off_t heapOffset, CompressionAlgorithmOwner* compressionAlgorithm,
PackageFileHeapWriter::PackageFileHeapWriter(BErrorOutput* errorOutput,
BPositionIO* file, off_t heapOffset,
CompressionAlgorithmOwner* compressionAlgorithm,
DecompressionAlgorithmOwner* decompressionAlgorithm)
:
PackageFileHeapAccessorBase(errorOutput, fd, heapOffset,
PackageFileHeapAccessorBase(errorOutput, file, heapOffset,
decompressionAlgorithm),
fPendingDataBuffer(NULL),
fCompressedDataBuffer(NULL),
@ -580,18 +579,14 @@ PackageFileHeapWriter::_WriteDataCompressed(const void* data, size_t size)
status_t
PackageFileHeapWriter::_WriteDataUncompressed(const void* data, size_t size)
{
ssize_t bytesWritten = pwrite(fFD, data, size,
fHeapOffset + (off_t)fCompressedHeapSize);
if (bytesWritten < 0) {
fErrorOutput->PrintError("Failed to write data: %s\n", strerror(errno));
return errno;
}
if ((size_t)bytesWritten != size) {
fErrorOutput->PrintError("Failed to write all data\n");
return B_ERROR;
status_t error = fFile->WriteAtExactly(
fHeapOffset + (off_t)fCompressedHeapSize, data, size);
if (error != B_OK) {
fErrorOutput->PrintError("Failed to write data: %s\n", strerror(error));
return error;
}
fCompressedHeapSize += bytesWritten;
fCompressedHeapSize += size;
return B_OK;
}

18
src/kits/package/hpkg/PackageReader.cpp
View File

@ -52,6 +52,16 @@ BPackageReader::Init(int fd, bool keepFD, uint32 flags)
}
status_t
BPackageReader::Init(BPositionIO* file, bool keepFile, uint32 flags)
{
if (fImpl == NULL)
return B_NO_INIT;
return fImpl->Init(file, keepFile, flags);
}
status_t
BPackageReader::ParseContent(BPackageContentHandler* contentHandler)
{
@ -72,13 +82,13 @@ BPackageReader::ParseContent(BLowLevelPackageContentHandler* contentHandler)
}
int
BPackageReader::PackageFileFD()
BPositionIO*
BPackageReader::PackageFile() const
{
if (fImpl == NULL)
return -1;
return NULL;
return fImpl->PackageFileFD();
return fImpl->PackageFile();
}

18
src/kits/package/hpkg/PackageReaderImpl.cpp
View File

@ -20,6 +20,8 @@
#include <ByteOrder.h>
#include <FdIO.h>
#include <package/hpkg/HPKGDefsPrivate.h>
#include <package/hpkg/PackageData.h>
@ -331,10 +333,24 @@ PackageReaderImpl::Init(const char* fileName, uint32 flags)
status_t
PackageReaderImpl::Init(int fd, bool keepFD, uint32 flags)
{
BFdIO* file = new(std::nothrow) BFdIO(fd, keepFD);
if (file == NULL) {
if (keepFD && fd >= 0)
close(fd);
return B_NO_MEMORY;
}
return Init(file, true, flags);
}
status_t
PackageReaderImpl::Init(BPositionIO* file, bool keepFile, uint32 flags)
{
hpkg_header header;
status_t error = inherited::Init<hpkg_header, B_HPKG_MAGIC, B_HPKG_VERSION,
B_HPKG_MINOR_VERSION>(fd, keepFD, header, flags);
B_HPKG_MINOR_VERSION>(file, keepFile, header, flags);
if (error != B_OK)
return error;
fHeapSize = UncompressedHeapSize();

5
src/kits/package/hpkg/PackageWriterImpl.cpp
View File

@ -648,7 +648,7 @@ PackageWriterImpl::_Init(const char* fileName,
// in update mode, parse the TOC
if ((Flags() & B_HPKG_WRITER_UPDATE_PACKAGE) != 0) {
PackageReaderImpl packageReader(fListener);
result = packageReader.Init(FD(), false, 0);
result = packageReader.Init(File(), false, 0);
if (result != B_OK)
return result;
@ -716,7 +716,8 @@ PackageWriterImpl::_Finish()
// can be greater when one or more files are shrunk. In creation mode it
// should already have the correct size.
off_t totalSize = fHeapWriter->HeapOffset() + (off_t)compressedHeapSize;
if (ftruncate(FD(), totalSize) != 0) {
error = File()->SetSize(totalSize);
if (error != B_OK) {
fListener->PrintError("Failed to truncate package file to new "
"size: %s\n", strerror(errno));
return errno;

41
src/kits/package/hpkg/ReaderImplBase.cpp
View File

@ -764,8 +764,8 @@ ReaderImplBase::ReaderImplBase(const char* fileType, BErrorOutput* errorOutput)
fPackageAttributesSection("package attributes"),
fFileType(fileType),
fErrorOutput(errorOutput),
fFD(-1),
fOwnsFD(false),
fFile(NULL),
fOwnsFile(false),
fRawHeapReader(NULL),
fHeapReader(NULL),
fCurrentSection(NULL)
@ -779,8 +779,8 @@ ReaderImplBase::~ReaderImplBase()
if (fRawHeapReader != fHeapReader)
delete fRawHeapReader;
if (fOwnsFD && fFD >= 0)
close(fFD);
if (fOwnsFile)
delete fFile;
}
@ -792,13 +792,11 @@ ReaderImplBase::UncompressedHeapSize() const
BAbstractBufferedDataReader*
ReaderImplBase::DetachHeapReader(PackageFileHeapReader** _rawHeapReader)
ReaderImplBase::DetachHeapReader(PackageFileHeapReader*& _rawHeapReader)
{
BAbstractBufferedDataReader* heapReader = fHeapReader;
_rawHeapReader = fRawHeapReader;
fHeapReader = NULL;
if (_rawHeapReader != NULL)
*_rawHeapReader = fRawHeapReader;
fRawHeapReader = NULL;
return heapReader;
@ -827,8 +825,9 @@ ReaderImplBase::InitHeapReader(uint32 compression, uint32 chunkSize,
return B_NO_MEMORY;
}
fRawHeapReader = new(std::nothrow) PackageFileHeapReader(fErrorOutput, fFD,
offset, compressedSize, uncompressedSize, decompressionAlgorithm);
fRawHeapReader = new(std::nothrow) PackageFileHeapReader(fErrorOutput,
fFile, offset, compressedSize, uncompressedSize,
decompressionAlgorithm);
if (fRawHeapReader == NULL)
return B_NO_MEMORY;
@ -1059,12 +1058,11 @@ ReaderImplBase::ParseAttributeTree(AttributeHandlerContext* context,
status_t
ReaderImplBase::_Init(int fd, bool keepFD)
ReaderImplBase::_Init(BPositionIO* file, bool keepFile)
{
fFD = fd;
fOwnsFD = keepFD;
return B_OK;
fFile = file;
fOwnsFile = keepFile;
return fFile != NULL ? B_OK : B_BAD_VALUE;
}
@ -1341,16 +1339,11 @@ ReaderImplBase::_ReadSectionBuffer(void* buffer, size_t size)
status_t
ReaderImplBase::ReadBuffer(off_t offset, void* buffer, size_t size)
{
ssize_t bytesRead = pread(fFD, buffer, size, offset);
if (bytesRead < 0) {
status_t error = fFile->ReadAtExactly(offset, buffer, size);
if (error != B_OK) {
fErrorOutput->PrintError("_ReadBuffer(%p, %lu) failed to read data: "
"%s\n", buffer, size, strerror(errno));
return errno;
}
if ((size_t)bytesRead != size) {
fErrorOutput->PrintError("_ReadBuffer(%p, %lu) failed to read all "
"data\n", buffer, size);
return B_ERROR;
"%s\n", buffer, size, strerror(error));
return error;
}
return B_OK;

19
src/kits/package/hpkg/RepositoryReaderImpl.cpp
View File

@ -18,6 +18,8 @@
#include <ByteOrder.h>
#include <Message.h>
#include <FdIO.h>
#include <package/hpkg/HPKGDefsPrivate.h>
#include <package/hpkg/RepositoryContentHandler.h>
@ -196,10 +198,25 @@ RepositoryReaderImpl::Init(const char* fileName)
status_t
RepositoryReaderImpl::Init(int fd, bool keepFD)
{
BFdIO* file = new(std::nothrow) BFdIO(fd, keepFD);
if (file == NULL) {
if (keepFD && fd >= 0)
close(fd);
return B_NO_MEMORY;
}
return Init(file, true);
}
status_t
RepositoryReaderImpl::Init(BPositionIO* file, bool keepFile)
{
hpkg_repo_header header;
status_t error = inherited::Init<hpkg_repo_header, B_HPKG_REPO_MAGIC,
B_HPKG_REPO_VERSION, B_HPKG_REPO_MINOR_VERSION>(fd, keepFD, header, 0);
B_HPKG_REPO_VERSION, B_HPKG_REPO_MINOR_VERSION>(file, keepFile, header,
0);
if (error != B_OK)
return error;

30
src/kits/package/hpkg/WriterImplBase.cpp
View File

@ -16,6 +16,7 @@
#include <new>
#include <ByteOrder.h>
#include <File.h>
#include <AutoDeleter.h>
#include <ZlibCompressionAlgorithm.h>
@ -226,7 +227,7 @@ WriterImplBase::WriterImplBase(const char* fileType, BErrorOutput* errorOutput)
fErrorOutput(errorOutput),
fFileName(NULL),
fParameters(),
fFD(-1),
fFile(NULL),
fFinished(false)
{
}
@ -240,8 +241,7 @@ WriterImplBase::~WriterImplBase()
delete fDecompressionAlgorithm;
delete fDecompressionParameters;
if (fFD >= 0)
close(fFD);
delete fFile;
if (!fFinished && fFileName != NULL
&& (Flags() & B_HPKG_WRITER_UPDATE_PACKAGE) == 0) {
@ -264,13 +264,16 @@ WriterImplBase::Init(const char* fileName, size_t headerSize,
if ((Flags() & B_HPKG_WRITER_UPDATE_PACKAGE) == 0)
openMode |= O_CREAT | O_TRUNC;
fFD = open(fileName, openMode, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
if (fFD < 0) {
BFile* file = new BFile;
status_t error = file->SetTo(fileName, openMode);
if (error != B_OK) {
fErrorOutput->PrintError("Failed to open %s file \"%s\": %s\n",
fFileType, fileName, strerror(errno));
return errno;
delete file;
return error;
}
fFile = file;
fFileName = fileName;
DecompressionAlgorithmOwner* decompressionAlgorithm
@ -305,7 +308,7 @@ WriterImplBase::Init(const char* fileName, size_t headerSize,
compressionAlgorithm, true);
// create heap writer
fHeapWriter = new PackageFileHeapWriter(fErrorOutput, FD(), headerSize,
fHeapWriter = new PackageFileHeapWriter(fErrorOutput, fFile, headerSize,
compressionAlgorithm, decompressionAlgorithm);
fHeapWriter->Init();
@ -717,17 +720,12 @@ WriterImplBase::WriteUnsignedLEB128(uint64 value)
void
WriterImplBase::RawWriteBuffer(const void* buffer, size_t size, off_t offset)
{
ssize_t bytesWritten = pwrite(fFD, buffer, size, offset);
if (bytesWritten < 0) {
status_t error = fFile->WriteAtExactly(offset, buffer, size);
if (error != B_OK) {
fErrorOutput->PrintError(
"RawWriteBuffer(%p, %lu) failed to write data: %s\n", buffer, size,
strerror(errno));
throw status_t(errno);
}
if ((size_t)bytesWritten != size) {
fErrorOutput->PrintError(
"RawWriteBuffer(%p, %lu) failed to write all data\n", buffer, size);
throw status_t(B_ERROR);
strerror(error));
throw error;
}
}

9
src/system/boot/loader/file_systems/packagefs/Jamfile
View File

@ -1,7 +1,7 @@
SubDir HAIKU_TOP src system boot loader file_systems packagefs ;
UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
UsePrivateHeaders kernel shared support ;
UsePrivateHeaders kernel shared storage support ;
UseBuildFeatureHeaders zlib ;
DEFINES += _BOOT_MODE ;
@ -13,6 +13,7 @@ SubDirC++Flags -fno-rtti -include $(kernelC++Header) ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package hpkg ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits storage ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits support ] ;
@ -20,8 +21,6 @@ BootStaticLibrary boot_packagefs :
packagefs.cpp
PackageSettingsItem.cpp
# package kit
# package kit/hpkg
BlockBufferPool.cpp
BlockBufferPoolImpl.cpp
@ -41,8 +40,10 @@ BootStaticLibrary boot_packagefs :
PackageReaderImpl.cpp
ReaderImplBase.cpp
# support kit
# storage kit
FdIO.cpp
# support kit
CompressionAlgorithm.cpp
ZlibCompressionAlgorithm.cpp

23
src/system/boot/loader/file_systems/packagefs/packagefs.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2011-2013, Ingo Weinhold, ingo_weinhold@gmx.de.
* Copyright 2011-2014, Ingo Weinhold, ingo_weinhold@gmx.de.
* Distributed under the terms of the MIT License.
*/
@ -18,6 +18,7 @@
#include <package/hpkg/PackageReaderImpl.h>
#include <AutoDeleter.h>
#include <FdIO.h>
#include <util/DoublyLinkedList.h>
@ -299,16 +300,14 @@ struct PackageVolume : BReferenceable, private PackageLoaderErrorOutput {
fNextNodeID(1),
fRootDirectory(this, S_IFDIR),
fHeapReader(NULL),
fFD(-1)
fFile(NULL)
{
}
~PackageVolume()
{
delete fHeapReader;
if (fFD >= 0)
close(fFD);
delete fFile;
}
status_t Init(int fd, const PackageFileHeapReader* heapReader)
@ -318,17 +317,23 @@ struct PackageVolume : BReferenceable, private PackageLoaderErrorOutput {
if (error != B_OK)
return error;
fFD = dup(fd);
if (fFD < 0)
fd = dup(fd);
if (fd < 0)
return errno;
fFile = new(std::nothrow) BFdIO(fd, true);
if (fFile == NULL) {
close(fd);
return B_NO_MEMORY;
}
// clone a heap reader and adjust it for our use
fHeapReader = heapReader->Clone();
if (fHeapReader == NULL)
return B_NO_MEMORY;
fHeapReader->SetErrorOutput(this);
fHeapReader->SetFD(fFD);
fHeapReader->SetFile(fFile);
return B_OK;
}
@ -354,7 +359,7 @@ private:
ino_t fNextNodeID;
PackageDirectory fRootDirectory;
PackageFileHeapReader* fHeapReader;
int fFD;
BPositionIO* fFile;
};