[haiku-commits] r40376 - in haiku/trunk: headers/os/package/hpkg headers/private/package/hpkg src/bin/package src/kits/package src/kits/package/hpkg
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 7 Feb 2011 23:25:17 +0100 (CET)
Author: zooey
Date: 2011-02-07 23:25:16 +0100 (Mon, 07 Feb 2011)
New Revision: 40376
Changeset: http://dev.haiku-os.org/changeset/40376
Added:
haiku/trunk/headers/os/package/hpkg/RepositoryWriter.h
haiku/trunk/headers/private/package/hpkg/WriterImplBase.h
haiku/trunk/src/kits/package/hpkg/WriterImplBase.cpp
Modified:
haiku/trunk/headers/os/package/hpkg/PackageWriter.h
haiku/trunk/headers/private/package/hpkg/PackageReaderImpl.h
haiku/trunk/headers/private/package/hpkg/PackageWriterImpl.h
haiku/trunk/headers/private/package/hpkg/Strings.h
haiku/trunk/headers/private/package/hpkg/haiku_package.h
haiku/trunk/src/bin/package/command_create.cpp
haiku/trunk/src/kits/package/Jamfile
haiku/trunk/src/kits/package/hpkg/PackageReaderImpl.cpp
haiku/trunk/src/kits/package/hpkg/PackageWriterImpl.cpp
haiku/trunk/src/kits/package/hpkg/Strings.cpp
Log:
Refactoring step towards implementation of RepositoryWriter:
* pulled commonly useful parts out of PackageWriterImpl into
WriterImplBase
* moved CachedStringTable and related methods into a separate class,
StringCache, in order to support having more than one string cache
per package file
* made package attribute section use a string cache, too, as that's
going to be very useful for repositories
* instead of writing package attributes directly, we now collect
corresponding PackageAttributes and write those later
* adjusted package reader accordingly
Modified: haiku/trunk/headers/os/package/hpkg/PackageWriter.h
===================================================================
--- haiku/trunk/headers/os/package/hpkg/PackageWriter.h 2011-02-07 22:08:41 UTC
(rev 40375)
+++ haiku/trunk/headers/os/package/hpkg/PackageWriter.h 2011-02-07 22:25:16 UTC
(rev 40376)
@@ -35,6 +35,7 @@
uint64
uncompressedMainSize,
uint64
uncompressedTOCSize) = 0;
virtual void OnPackageAttributesSizeInfo(
+ uint32
stringCount,
uint32
uncompressedSize) = 0;
virtual void OnPackageSizeInfo(uint32
headerSize,
uint64
heapSize, uint64 tocSize,
Added: haiku/trunk/headers/os/package/hpkg/RepositoryWriter.h
===================================================================
--- haiku/trunk/headers/os/package/hpkg/RepositoryWriter.h
(rev 0)
+++ haiku/trunk/headers/os/package/hpkg/RepositoryWriter.h 2011-02-07
22:25:16 UTC (rev 40376)
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2011, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _PACKAGE__HPKG__REPOSITORY_WRITER_H_
+#define _PACKAGE__HPKG__REPOSITORY_WRITER_H_
+
+
+#include <SupportDefs.h>
+
+#include <package/hpkg/ErrorOutput.h>
+
+
+namespace BPackageKit {
+
+namespace BHPKG {
+
+
+namespace BPrivate {
+ class RepositoryWriterImpl;
+}
+using BPrivate::RepositoryWriterImpl;
+
+
+class BRepositoryWriterListener : public BErrorOutput {
+public:
+ virtual void PrintErrorVarArgs(const char*
format,
+ va_list
args) = 0;
+
+ virtual void OnPackageAdded(
+ const
BPackageInfo& packageInfo) = 0;
+
+ virtual void OnPackageAttributesSizeInfo(
+ uint32
uncompressedSize) = 0;
+ virtual void OnRepositorySizeInfo(uint32
headerSize,
+ uint32
packageAttributesSize,
+ uint64
totalSize) = 0;
+};
+
+
+class BRepositoryWriter {
+public:
+public:
+
BRepositoryWriter(
+
BRepositoryWriterListener* listener);
+
~BRepositoryWriter();
+
+ status_t Init(const char*
fileName);
+ status_t AddPackage(const
BPackageInfo& packageInfo);
+ status_t Finish();
+
+private:
+ RepositoryWriterImpl* fImpl;
+};
+
+
+} // namespace BHPKG
+
+} // namespace BPackageKit
+
+
+#endif // _PACKAGE__HPKG__REPOSITORY_WRITER_H_
Modified: haiku/trunk/headers/private/package/hpkg/PackageReaderImpl.h
===================================================================
--- haiku/trunk/headers/private/package/hpkg/PackageReaderImpl.h
2011-02-07 22:08:41 UTC (rev 40375)
+++ haiku/trunk/headers/private/package/hpkg/PackageReaderImpl.h
2011-02-07 22:25:16 UTC (rev 40376)
@@ -65,17 +65,22 @@
uint8* data;
uint64 offset;
uint64 currentOffset;
+ uint64 stringsLength;
+ uint64 stringsCount;
+ char** strings;
const char* name;
SectionInfo(const char* _name)
:
data(NULL),
+ strings(NULL),
name(_name)
{
}
~SectionInfo()
{
+ delete[] strings;
delete[] data;
}
};
@@ -90,8 +95,9 @@
const
SectionInfo& section) const;
status_t
_ParseTOCAttributeTypes();
- status_t _ParseTOCStrings();
+ status_t _ParseStrings();
+
status_t
_ParseContent(AttributeHandlerContext* context,
AttributeHandler* rootAttributeHandler);
status_t _ParseAttributeTree(
@@ -153,15 +159,12 @@
uint64
fTOCAttributeTypesLength;
uint64 fTOCAttributeTypesCount;
- uint64 fTOCStringsLength;
- uint64 fTOCStringsCount;
SectionInfo fTOCSection;
SectionInfo
fPackageAttributesSection;
SectionInfo* fCurrentSection;
AttributeTypeReference* fAttributeTypes;
- char** fStrings;
AttributeHandlerList* fAttributeHandlerStack;
Modified: haiku/trunk/headers/private/package/hpkg/PackageWriterImpl.h
===================================================================
--- haiku/trunk/headers/private/package/hpkg/PackageWriterImpl.h
2011-02-07 22:08:41 UTC (rev 40375)
+++ haiku/trunk/headers/private/package/hpkg/PackageWriterImpl.h
2011-02-07 22:25:16 UTC (rev 40376)
@@ -10,9 +10,9 @@
#include <util/DoublyLinkedList.h>
#include <util/OpenHashTable.h>
-#include <package/PackageInfo.h>
#include <package/hpkg/PackageWriter.h>
#include <package/hpkg/Strings.h>
+#include <package/hpkg/WriterImplBase.h>
namespace BPackageKit {
@@ -29,7 +29,7 @@
struct hpkg_header;
-class PackageWriterImpl {
+class PackageWriterImpl : public WriterImplBase {
public:
PackageWriterImpl(
BPackageWriterListener* listener);
@@ -40,18 +40,13 @@
status_t Finish();
private:
- struct AttributeValue;
struct AttributeTypeKey;
struct AttributeType;
struct AttributeTypeHashDefinition;
struct Attribute;
struct AttributeTypeUsageGreater;
struct Entry;
- struct DataWriter;
- struct DummyDataWriter;
- struct FDDataWriter;
struct SubPathAdder;
- struct ZlibDataWriter;
typedef BOpenHashTable<AttributeTypeHashDefinition>
AttributeTypeTable;
@@ -66,34 +61,26 @@
const
char* name, size_t nameLength,
bool
isImplicit);
+ void _RegisterPackageInfo(
+
PackageAttributeList& attributeList,
+ const
BPackageInfo& packageInfo);
+ void _RegisterPackageVersion(
+
PackageAttributeList& attributeList,
+ const
BPackageVersion& version);
+ void
_RegisterPackageResolvableExpressionList(
+
PackageAttributeList& attributeList,
+ const
BObjectList<
+
BPackageResolvableExpression>& list,
+ uint8
id);
+
void _WriteTOC(hpkg_header&
header);
int32
_WriteTOCSections(uint64& _attributeTypesSize,
uint64&
_stringsSize, uint64& _mainSize);
void _WriteAttributeTypes();
- int32 _WriteCachedStrings();
void
_WriteAttributeChildren(Attribute* attribute);
void
_WritePackageAttributes(hpkg_header& header);
- void _WriteAttributeValue(
- const
AttributeValue& value,
- uint8
encoding);
- void
_WriteUnsignedLEB128(uint64 value);
- inline void _WriteString(const char*
string);
-
- void _WritePackageVersion(
- const
BPackageVersion& version);
- void
_WritePackageResolvableExpressionList(
- const
BObjectList<
-
BPackageResolvableExpression>& list,
- uint8
id);
-
- template<typename Type>
- inline void _Write(const Type& value);
-
- void _WriteBuffer(const
void* buffer, size_t size,
- off_t
offset);
-
void _AddEntry(int dirFD,
Entry* entry,
const
char* fileName, char* pathBuffer);
@@ -111,38 +98,30 @@
Attribute* _AddDataAttribute(const
char* attributeName,
uint64
dataSize, const uint8* data);
- CachedString* _GetCachedString(const char*
value);
AttributeType* _GetAttributeType(const char*
attributeName,
uint8
type);
status_t _AddData(BDataReader&
dataReader, off_t size);
+
status_t
_WriteUncompressedData(BDataReader& dataReader,
off_t
size, uint64 writeOffset);
- status_t
_WriteZlibCompressedData(BDataReader& dataReader,
+ status_t
_WriteZlibCompressedData(
+
BDataReader& dataReader,
off_t
size, uint64 writeOffset,
uint64&
_compressedSize);
private:
BPackageWriterListener* fListener;
- const char* fFileName;
- int fFD;
- bool fFinished;
off_t fHeapOffset;
off_t fHeapEnd;
- void* fDataBuffer;
- size_t fDataBufferSize;
- BPackageInfo fPackageInfo;
-
- DataWriter* fDataWriter;
-
Entry* fRootEntry;
Attribute* fRootAttribute;
Attribute* fTopAttribute;
- CachedStringTable* fCachedStrings;
+ StringCache fStringCache;
AttributeTypeTable* fAttributeTypes;
};
Modified: haiku/trunk/headers/private/package/hpkg/Strings.h
===================================================================
--- haiku/trunk/headers/private/package/hpkg/Strings.h 2011-02-07 22:08:41 UTC
(rev 40375)
+++ haiku/trunk/headers/private/package/hpkg/Strings.h 2011-02-07 22:25:16 UTC
(rev 40376)
@@ -6,6 +6,8 @@
#define _PACKAGE__HPKG__PRIVATE__STRINGS_H_
+#include <new>
+
#include <util/OpenHashTable.h>
@@ -86,6 +88,15 @@
};
+struct StringCache : public CachedStringTable {
+ StringCache();
+ ~StringCache();
+
+ CachedString* Get(const char* value);
+
+};
+
+
} // namespace BPrivate
} // namespace BHPKG
Added: haiku/trunk/headers/private/package/hpkg/WriterImplBase.h
===================================================================
--- haiku/trunk/headers/private/package/hpkg/WriterImplBase.h
(rev 0)
+++ haiku/trunk/headers/private/package/hpkg/WriterImplBase.h 2011-02-07
22:25:16 UTC (rev 40376)
@@ -0,0 +1,234 @@
+/*
+ * Copyright 2011, Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _PACKAGE__HPKG__PRIVATE__WRITER_IMPL_BASE_H_
+#define _PACKAGE__HPKG__PRIVATE__WRITER_IMPL_BASE_H_
+
+
+#include <util/DoublyLinkedList.h>
+
+#include <package/hpkg/haiku_package.h>
+
+#include <package/hpkg/DataOutput.h>
+#include <package/hpkg/Strings.h>
+#include <package/hpkg/ZlibCompressor.h>
+
+#include <package/PackageInfo.h>
+
+
+namespace BPackageKit {
+
+namespace BHPKG {
+
+
+class BDataReader;
+class BErrorOutput;
+
+
+namespace BPrivate {
+
+
+struct hpkg_header;
+
+class WriterImplBase {
+public:
+
WriterImplBase(BErrorOutput* errorOutput);
+
~WriterImplBase();
+
+protected:
+
+
+ struct AttributeValue {
+ union {
+ int64 signedInt;
+ uint64 unsignedInt;
+ CachedString* string;
+ struct {
+ uint64 size;
+ union {
+ uint64 offset;
+ uint8
raw[B_HPKG_MAX_INLINE_DATA_SIZE];
+ };
+ } data;
+ };
+ uint8 type;
+ int8 encoding;
+
+ AttributeValue();
+ ~AttributeValue();
+
+ void SetTo(int8 value);
+ void SetTo(uint8 value);
+ void SetTo(int16 value);
+ void SetTo(uint16 value);
+ void SetTo(int32 value);
+ void SetTo(uint32 value);
+ void SetTo(int64 value);
+ void SetTo(uint64 value);
+ void SetTo(CachedString* value);
+ void SetToData(uint64 size, uint64 offset);
+ void SetToData(uint64 size, const void*
rawData);
+ uint8 ApplicableEncoding() const;
+
+ private:
+ static uint8 _ApplicableIntEncoding(uint64
value);
+ };
+
+
+ struct PackageAttribute :
+ public
DoublyLinkedListLinkImpl<PackageAttribute>,
+ public AttributeValue {
+ HPKGPackageAttributeID
id;
+ DoublyLinkedList<PackageAttribute>
children;
+
+ PackageAttribute(HPKGPackageAttributeID id_,
uint8 type,
+ uint8 encoding);
+ ~PackageAttribute();
+
+ void AddChild(PackageAttribute* child);
+
+ private:
+ void _DeleteChildren();
+ };
+
+
+ struct DataWriter {
+ DataWriter();
+ virtual ~DataWriter();
+
+ uint64 BytesWritten() const;
+
+ virtual status_t WriteDataNoThrow(const void*
buffer,
+ size_t size) = 0;
+
+ void WriteDataThrows(const void* buffer, size_t
size);
+
+ protected:
+ uint64 fBytesWritten;
+ };
+
+
+ struct FDDataWriter : DataWriter {
+ FDDataWriter(int fd, off_t offset,
BErrorOutput* errorOutput);
+
+ virtual status_t WriteDataNoThrow(const void*
buffer,
+ size_t size);
+
+ off_t Offset() const;
+
+ private:
+ int fFD;
+ off_t fOffset;
+ BErrorOutput* fErrorOutput;
+ };
+
+
+ struct ZlibDataWriter : DataWriter, private BDataOutput
{
+ ZlibDataWriter(DataWriter* dataWriter);
+
+ void Init();
+
+ void Finish();
+
+ virtual status_t WriteDataNoThrow(const void*
buffer,
+ size_t size);
+
+ private:
+ // BDataOutput
+ virtual status_t WriteData(const void* buffer,
size_t size);
+
+ private:
+ DataWriter* fDataWriter;
+ ZlibCompressor fCompressor;
+ };
+
+
+ typedef DoublyLinkedList<PackageAttribute>
PackageAttributeList;
+
+protected:
+ status_t Init(const char*
fileName, const char* type);
+
+ int32
WriteCachedStrings(const StringCache& cache,
+ uint32
minUsageCount);
+
+ void WritePackageAttributes(
+ const
PackageAttributeList& attributes);
+ void WritePackageVersion(
+ const
BPackageVersion& version);
+ void
WritePackageResolvableExpressionList(
+ const
BObjectList<
+
BPackageResolvableExpression>& list,
+ uint8
id);
+
+ void
WriteAttributeValue(const AttributeValue& value,
+ uint8
encoding);
+ void
WriteUnsignedLEB128(uint64 value);
+ inline void WriteString(const char* string);
+
+ template<typename Type>
+ inline void Write(const Type& value);
+
+ void WriteBuffer(const void*
buffer, size_t size,
+ off_t
offset);
+
+protected:
+ BErrorOutput* fErrorOutput;
+ const char* fFileName;
+ int fFD;
+ bool fFinished;
+ void* fDataBuffer;
+ const size_t fDataBufferSize;
+
+ DataWriter* fDataWriter;
+
+ StringCache fPackageStringCache;
+ DoublyLinkedList<PackageAttribute>
fPackageAttributes;
+};
+
+
+inline uint64
+WriterImplBase::DataWriter::BytesWritten() const
+{
+ return fBytesWritten;
+}
+
+
+inline void
+WriterImplBase::DataWriter::WriteDataThrows(const void* buffer, size_t size)
+{
+ status_t error = WriteDataNoThrow(buffer, size);
+ if (error != B_OK)
+ throw status_t(error);
+}
+
+inline off_t
+WriterImplBase::FDDataWriter::Offset() const
+{
+ return fOffset;
+}
+
+
+template<typename Type>
+inline void
+WriterImplBase::Write(const Type& value)
+{
+ fDataWriter->WriteDataThrows(&value, sizeof(Type));
+}
+
+
+inline void
+WriterImplBase::WriteString(const char* string)
+{
+ fDataWriter->WriteDataThrows(string, strlen(string) + 1);
+}
+
+
+} // namespace BPrivate
+
+} // namespace BHPKG
+
+} // namespace BPackageKit
+
+
+#endif // _PACKAGE__HPKG__PRIVATE__WRITER_IMPL_BASE_H_
Modified: haiku/trunk/headers/private/package/hpkg/haiku_package.h
===================================================================
--- haiku/trunk/headers/private/package/hpkg/haiku_package.h 2011-02-07
22:08:41 UTC (rev 40375)
+++ haiku/trunk/headers/private/package/hpkg/haiku_package.h 2011-02-07
22:25:16 UTC (rev 40376)
@@ -29,6 +29,8 @@
uint32 attributes_compression;
uint32 attributes_length_compressed;
uint32 attributes_length_uncompressed;
+ uint32 attributes_strings_length;
+ uint32 attributes_strings_count;
// TOC section
uint32 toc_compression;
Modified: haiku/trunk/src/bin/package/command_create.cpp
===================================================================
--- haiku/trunk/src/bin/package/command_create.cpp 2011-02-07 22:08:41 UTC
(rev 40375)
+++ haiku/trunk/src/bin/package/command_create.cpp 2011-02-07 22:25:16 UTC
(rev 40376)
@@ -63,12 +63,14 @@
uncompressedTOCSize);
}
- virtual void OnPackageAttributesSizeInfo(uint32 uncompressedSize)
+ virtual void OnPackageAttributesSizeInfo(uint32 stringCount,
+ uint32 uncompressedSize)
{
if (fQuiet || !fVerbose)
return;
printf("----- Package Attribute Info -----\n");
+ printf("string count: %10ld\n", stringCount);
printf("package attributes size: %10ld (uncompressed)\n",
uncompressedSize);
}
Modified: haiku/trunk/src/kits/package/Jamfile
===================================================================
--- haiku/trunk/src/kits/package/Jamfile 2011-02-07 22:08:41 UTC (rev
40375)
+++ haiku/trunk/src/kits/package/Jamfile 2011-02-07 22:25:16 UTC (rev
40376)
@@ -26,6 +26,7 @@
PackageWriter.cpp
PackageWriterImpl.cpp
Strings.cpp
+ WriterImplBase.cpp
# compression
ZlibCompressionBase.cpp
Modified: haiku/trunk/src/kits/package/hpkg/PackageReaderImpl.cpp
===================================================================
--- haiku/trunk/src/kits/package/hpkg/PackageReaderImpl.cpp 2011-02-07
22:08:41 UTC (rev 40375)
+++ haiku/trunk/src/kits/package/hpkg/PackageReaderImpl.cpp 2011-02-07
22:25:16 UTC (rev 40376)
@@ -620,7 +620,6 @@
fPackageAttributesSection("package attributes section"),
fCurrentSection(NULL),
fAttributeTypes(NULL),
- fStrings(NULL),
fScratchBuffer(NULL),
fScratchBufferSize(0)
{
@@ -633,7 +632,6 @@
close(fFD);
delete[] fScratchBuffer;
- delete[] fStrings;
delete[] fAttributeTypes;
}
@@ -713,6 +711,10 @@
= B_BENDIAN_TO_HOST_INT32(header.attributes_length_compressed);
fPackageAttributesSection.uncompressedLength
=
B_BENDIAN_TO_HOST_INT32(header.attributes_length_uncompressed);
+ fPackageAttributesSection.stringsLength
+ = B_BENDIAN_TO_HOST_INT32(header.attributes_strings_length);
+ fPackageAttributesSection.stringsCount
+ = B_BENDIAN_TO_HOST_INT32(header.attributes_strings_count);
if (const char* errorString = _CheckCompression(
fPackageAttributesSection)) {
@@ -739,14 +741,16 @@
= B_BENDIAN_TO_HOST_INT64(header.toc_attribute_types_length);
fTOCAttributeTypesCount
= B_BENDIAN_TO_HOST_INT64(header.toc_attribute_types_count);
- fTOCStringsLength = B_BENDIAN_TO_HOST_INT64(header.toc_strings_length);
- fTOCStringsCount = B_BENDIAN_TO_HOST_INT64(header.toc_strings_count);
+ fTOCSection.stringsLength
+ = B_BENDIAN_TO_HOST_INT64(header.toc_strings_length);
+ fTOCSection.stringsCount
+ = B_BENDIAN_TO_HOST_INT64(header.toc_strings_count);
if (fTOCAttributeTypesLength > fTOCSection.uncompressedLength
- || fTOCStringsLength
+ || fTOCSection.stringsLength
> fTOCSection.uncompressedLength -
fTOCAttributeTypesLength
|| fTOCAttributeTypesCount > fTOCAttributeTypesLength
- || fTOCStringsCount > fTOCStringsLength) {
+ || fTOCSection.stringsCount > fTOCSection.stringsLength) {
fErrorOutput->PrintError("Error: Invalid package file: Invalid
TOC "
"subsections description\n");
return B_BAD_DATA;
@@ -829,10 +833,10 @@
fCurrentSection->currentOffset += fTOCAttributeTypesLength;
// strings
- error = _ParseTOCStrings();
+ error = _ParseStrings();
if (error != B_OK)
return error;
- fCurrentSection->currentOffset += fTOCStringsLength;
+ fCurrentSection->currentOffset += fCurrentSection->stringsLength;
return B_OK;
}
@@ -851,6 +855,12 @@
fCurrentSection = &fPackageAttributesSection;
fCurrentSection->currentOffset = 0;
+ // strings
+ status_t error = _ParseStrings();
+ if (error != B_OK)
+ return error;
+ fCurrentSection->currentOffset += fCurrentSection->stringsLength;
+
return _ParsePackageAttributes(&context);
}
@@ -916,7 +926,6 @@
if (position + 1 != sectionEnd) {
fErrorOutput->PrintError("Error: Excess bytes
in TOC attribute "
"types section\n");
-TRACE("position: %p, sectionEnd: %p\n", position, sectionEnd);
return B_BAD_DATA;
}
@@ -941,28 +950,30 @@
fAttributeTypes[index].type = type;
fAttributeTypes[index].standardIndex = _GetStandardIndex(type);
index++;
-TRACE("type: %u, \"%s\"\n", type->type, type->name);
}
}
status_t
-PackageReaderImpl::_ParseTOCStrings()
+PackageReaderImpl::_ParseStrings()
{
// allocate table
- fStrings = new(std::nothrow) char*[fTOCStringsCount];
- if (fStrings == NULL) {
+ fCurrentSection->strings
+ = new(std::nothrow) char*[fCurrentSection->stringsCount];
+ if (fCurrentSection->strings == NULL) {
fErrorOutput->PrintError("Error: Out of memory!\n");
return B_NO_MEMORY;
}
// parse the section and fill the table
- char* position = (char*)fTOCSection.data + fTOCSection.currentOffset;
- char* sectionEnd = position + fTOCStringsLength;
+ char* position
+ = (char*)fCurrentSection->data + fCurrentSection->currentOffset;
+ char* sectionEnd = position + fCurrentSection->stringsLength;
uint32 index = 0;
while (true) {
if (position >= sectionEnd) {
- fErrorOutput->PrintError("Error: Malformed TOC strings
section\n");
+ fErrorOutput->PrintError("Error: Malformed %s strings
section\n",
+ fCurrentSection->name);
return B_BAD_DATA;
}
@@ -970,29 +981,31 @@
if (stringLength == 0) {
if (position + 1 != sectionEnd) {
- fErrorOutput->PrintError("Error: Excess bytes
in TOC strings "
- "section\n");
-TRACE("position: %p, sectionEnd: %p\n", position, sectionEnd);
+ fErrorOutput->PrintError(
+ "Error: %ld excess bytes in %s strings
section\n",
+ sectionEnd - (position + 1),
fCurrentSection->name);
return B_BAD_DATA;
}
- if (index != fTOCStringsCount) {
- fErrorOutput->PrintError("Error: Invalid TOC
strings section: "
- "Less strings than specified in the
header\n");
+ if (index != fCurrentSection->stringsCount) {
+ fErrorOutput->PrintError("Error: Invalid %s
strings section: "
+ "Less strings (%lld) than specified in
the header (%lld)\n",
+ fCurrentSection->name, index,
+ fCurrentSection->stringsCount);
return B_BAD_DATA;
}
return B_OK;
}
- if (index >= fTOCStringsCount) {
- fErrorOutput->PrintError("Error: Invalid TOC strings
section: "
- "More strings than specified in the header\n");
+ if (index >= fCurrentSection->stringsCount) {
+ fErrorOutput->PrintError("Error: Invalid %s strings
section: "
+ "More strings (%lld) than specified in the
header (%lld)\n",
+ fCurrentSection->name, index,
fCurrentSection->stringsCount);
return B_BAD_DATA;
}
- fStrings[index++] = position;
-TRACE("string: \"%s\"\n", position);
+ fCurrentSection->strings[index++] = position;
position += stringLength + 1;
}
}
@@ -1003,7 +1016,8 @@
AttributeHandler* rootAttributeHandler)
{
// parse the TOC
- fTOCSection.currentOffset = fTOCAttributeTypesLength +
fTOCStringsLength;
+ fTOCSection.currentOffset = fTOCAttributeTypesLength
+ + fTOCSection.stringsLength;
// prepare attribute handler context
context->heapOffset = fHeapOffset;
@@ -1491,9 +1505,9 @@
}
default:
{
- fErrorOutput->PrintError("Error:
Invalid TOC section: "
- "invalid encoding %d for int
value type %d\n", encoding,
- type);
+ fErrorOutput->PrintError("Error:
Invalid %s section: "
+ "invalid encoding %d for int
value type %d\n",
+ fCurrentSection->name,
encoding, type);
return B_BAD_VALUE;
}
}
@@ -1517,13 +1531,15 @@
if (error != B_OK)
return error;
- if (index > fTOCStringsCount) {
- fErrorOutput->PrintError("Error:
Invalid TOC section: "
- "string reference out of
bounds\n");
+ if (index > fCurrentSection->stringsCount) {
+ fErrorOutput->PrintError("Error:
Invalid %s section: "
+ "string reference (%lld) out of
bounds (%lld)\n",
+ fCurrentSection->name, index,
+ fCurrentSection->stringsCount);
return B_BAD_DATA;
}
- _value.SetTo(fStrings[index]);
+ _value.SetTo(fCurrentSection->strings[index]);
} else if (encoding ==
B_HPKG_ATTRIBUTE_ENCODING_STRING_INLINE) {
const char* string;
status_t error = _ReadString(string);
@@ -1532,8 +1548,8 @@
_value.SetTo(string);
} else {
- fErrorOutput->PrintError("Error: Invalid TOC
section: invalid "
- "string encoding (%u)\n", encoding);
+ fErrorOutput->PrintError("Error: Invalid %s
section: invalid "
+ "string encoding (%u)\n",
fCurrentSection->name, encoding);
return B_BAD_DATA;
}
@@ -1554,16 +1570,16 @@
return error;
if (offset > fHeapSize || size > fHeapSize -
offset) {
- fErrorOutput->PrintError("Error:
Invalid TOC section: "
- "invalid data reference\n");
+ fErrorOutput->PrintError("Error:
Invalid %s section: "
+ "invalid data reference\n",
fCurrentSection->name);
return B_BAD_DATA;
}
_value.SetToData(size, fHeapOffset + offset);
} else if (encoding ==
B_HPKG_ATTRIBUTE_ENCODING_RAW_INLINE) {
if (size > B_HPKG_MAX_INLINE_DATA_SIZE) {
- fErrorOutput->PrintError("Error:
Invalid TOC section: "
- "inline data too long\n");
+ fErrorOutput->PrintError("Error:
Invalid %s section: "
+ "inline data too long\n",
fCurrentSection->name);
return B_BAD_DATA;
}
@@ -1573,8 +1589,8 @@
return error;
_value.SetToData(size, buffer);
} else {
- fErrorOutput->PrintError("Error: Invalid TOC
section: invalid "
- "raw encoding (%u)\n", encoding);
+ fErrorOutput->PrintError("Error: Invalid %s
section: invalid "
+ "raw encoding (%u)\n",
fCurrentSection->name, encoding);
return B_BAD_DATA;
}
@@ -1582,8 +1598,8 @@
}
default:
- fErrorOutput->PrintError("Error: Invalid TOC section:
invalid "
- "value type: %d\n", type);
+ fErrorOutput->PrintError("Error: Invalid %s section:
invalid "
+ "value type: %d\n", fCurrentSection->name,
type);
return B_BAD_DATA;
}
}
Modified: haiku/trunk/src/kits/package/hpkg/PackageWriterImpl.cpp
===================================================================
--- haiku/trunk/src/kits/package/hpkg/PackageWriterImpl.cpp 2011-02-07
22:08:41 UTC (rev 40375)
+++ haiku/trunk/src/kits/package/hpkg/PackageWriterImpl.cpp 2011-02-07
22:25:16 UTC (rev 40376)
@@ -30,7 +30,6 @@
#include <package/hpkg/DataOutput.h>
#include <package/hpkg/DataReader.h>
#include <package/hpkg/Stacker.h>
-#include <package/hpkg/ZlibCompressor.h>
using BPrivate::FileDescriptorCloser;
@@ -50,139 +49,6 @@
// #pragma mark - Attributes
-struct PackageWriterImpl::AttributeValue {
- union {
- int64 signedInt;
- uint64 unsignedInt;
- CachedString* string;
- struct {
- uint64 size;
- union {
- uint64 offset;
- uint8 raw[B_HPKG_MAX_INLINE_DATA_SIZE];
- };
- } data;
- };
- uint8 type;
- int8 encoding;
-
- AttributeValue()
- :
- type(B_HPKG_ATTRIBUTE_TYPE_INVALID),
- encoding(-1)
- {
- }
-
- ~AttributeValue()
- {
- }
-
- void SetTo(int8 value)
- {
- signedInt = value;
- type = B_HPKG_ATTRIBUTE_TYPE_INT;
- }
-
- void SetTo(uint8 value)
- {
- unsignedInt = value;
- type = B_HPKG_ATTRIBUTE_TYPE_UINT;
- }
-
- void SetTo(int16 value)
- {
- signedInt = value;
- type = B_HPKG_ATTRIBUTE_TYPE_INT;
- }
-
- void SetTo(uint16 value)
- {
- unsignedInt = value;
- type = B_HPKG_ATTRIBUTE_TYPE_UINT;
- }
-
- void SetTo(int32 value)
- {
- signedInt = value;
- type = B_HPKG_ATTRIBUTE_TYPE_INT;
- }
-
- void SetTo(uint32 value)
- {
- unsignedInt = value;
- type = B_HPKG_ATTRIBUTE_TYPE_UINT;
- }
-
- void SetTo(int64 value)
- {
- signedInt = value;
- type = B_HPKG_ATTRIBUTE_TYPE_INT;
- }
-
- void SetTo(uint64 value)
- {
- unsignedInt = value;
- type = B_HPKG_ATTRIBUTE_TYPE_UINT;
- }
-
- void SetTo(CachedString* value)
- {
- string = value;
- type = B_HPKG_ATTRIBUTE_TYPE_STRING;
- }
-
- void SetToData(uint64 size, uint64 offset)
- {
- data.size = size;
- data.offset = offset;
- type = B_HPKG_ATTRIBUTE_TYPE_RAW;
- encoding = B_HPKG_ATTRIBUTE_ENCODING_RAW_HEAP;
- }
-
- void SetToData(uint64 size, const void* rawData)
- {
- data.size = size;
- if (size > 0)
- memcpy(data.raw, rawData, size);
- type = B_HPKG_ATTRIBUTE_TYPE_RAW;
- encoding = B_HPKG_ATTRIBUTE_ENCODING_RAW_INLINE;
- }
-
- uint8 PreferredEncoding() const
- {
- switch (type) {
- case B_HPKG_ATTRIBUTE_TYPE_INT:
- return _PreferredIntEncoding(signedInt >= 0
- ? (uint64)signedInt << 1
- : (uint64)(-(signedInt + 1) << 1));
- case B_HPKG_ATTRIBUTE_TYPE_UINT:
- return _PreferredIntEncoding(unsignedInt);
- case B_HPKG_ATTRIBUTE_TYPE_STRING:
- return string->index >= 0
- ? B_HPKG_ATTRIBUTE_ENCODING_STRING_TABLE
- :
B_HPKG_ATTRIBUTE_ENCODING_STRING_INLINE;
- case B_HPKG_ATTRIBUTE_TYPE_RAW:
- return encoding;
- default:
- return 0;
- }
- }
-
-private:
- static uint8 _PreferredIntEncoding(uint64 value)
- {
- if (value <= 0xff)
- return B_HPKG_ATTRIBUTE_ENCODING_INT_8_BIT;
- if (value <= 0xffff)
- return B_HPKG_ATTRIBUTE_ENCODING_INT_16_BIT;
- if (value <= 0xffffffff)
- return B_HPKG_ATTRIBUTE_ENCODING_INT_32_BIT;
-
- return B_HPKG_ATTRIBUTE_ENCODING_INT_64_BIT;
- }
-};
[... truncated: 1478 lines follow ...]
Other related posts:
- » [haiku-commits] r40376 - in haiku/trunk: headers/os/package/hpkg headers/private/package/hpkg src/bin/package src/kits/package src/kits/package/hpkg - zooey
