Merge branch 'master' into package-management
Additional changes: * Add src/system/kernel/lib/zlib, which builds a kernel version of zlib, needed by packagefs. * BuildFeatures: Add a build feature "gcc2" to allow for easier checks. * Referenceable.cpp: Include <OS.h> instead of <debugger.h>. The latter is not needed and prevents building for the build platform. * zlib/zutil.h: Fix gcc 2 build. We really should use the external package instead. Conflicts: .gitignore build/jam/BuildSetup build/jam/FileRules build/jam/FloppyBootImage build/jam/HaikuImage build/jam/ImageRules build/jam/KernelRules build/jam/NetBootArchive build/jam/OptionalBuildFeatures build/jam/OptionalLibPackages build/jam/OptionalPackageDependencies build/jam/OptionalPackages build/scripts/build_haiku_image configure data/bin/installoptionalpackage data/system/boot/Bootscript headers/os/app/Message.h headers/os/package/PackageInfo.h headers/os/package/PackageInfoAttributes.h headers/os/package/PackageInfoSet.h headers/os/package/PackageRoster.h headers/os/package/PackageVersion.h headers/os/package/hpkg/PackageInfoAttributeValue.h headers/os/storage/FindDirectory.h headers/os/storage/Node.h headers/os/support/StringList.h headers/private/system/directories.h src/add-ons/kernel/drivers/audio/ac97/es1370/Jamfile src/add-ons/kernel/file_systems/packagefs/AttributeIndex.cpp src/add-ons/kernel/file_systems/packagefs/Jamfile src/add-ons/kernel/file_systems/packagefs/Package.cpp src/add-ons/kernel/file_systems/packagefs/Package.h src/add-ons/kernel/file_systems/packagefs/PackageDomain.cpp src/add-ons/kernel/file_systems/packagefs/PackageDomain.h src/add-ons/kernel/file_systems/packagefs/PackageFSRoot.cpp src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.cpp src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.h src/add-ons/kernel/file_systems/packagefs/PackageLinkSymlink.cpp src/add-ons/kernel/file_systems/packagefs/PackageLinkSymlink.h src/add-ons/kernel/file_systems/packagefs/PackageLinksDirectory.cpp src/add-ons/kernel/file_systems/packagefs/PackageNode.h src/add-ons/kernel/file_systems/packagefs/ResolvableFamily.cpp src/add-ons/kernel/file_systems/packagefs/Version.cpp src/add-ons/kernel/file_systems/packagefs/Version.h src/add-ons/kernel/file_systems/packagefs/Volume.cpp src/add-ons/kernel/file_systems/packagefs/Volume.h src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp src/add-ons/kernel/file_systems/userlandfs/shared/driver_settings.c src/apps/deskbar/BarApp.cpp src/apps/deskbar/BarMenuBar.cpp src/apps/deskbar/BarMenuBar.h src/apps/deskbar/BarView.cpp src/apps/deskbar/BarView.h src/apps/deskbar/BarWindow.cpp src/apps/deskbar/BarWindow.h src/apps/deskbar/DeskbarMenu.cpp src/apps/deskbar/DeskbarMenu.h src/apps/deskbar/DeskbarUtils.cpp src/apps/deskbar/DeskbarUtils.h src/apps/deskbar/ExpandoMenuBar.cpp src/apps/deskbar/ExpandoMenuBar.h src/apps/deskbar/TeamMenu.cpp src/apps/processcontroller/ProcessController.cpp src/apps/remotedesktop/RemoteDesktop.cpp src/bin/bash/config-top.h src/bin/finddir.c src/bin/package/Jamfile src/bin/package/command_add.cpp src/bin/package/command_create.cpp src/bin/package/command_list.cpp src/bin/package_repo/command_list.cpp src/bin/pkgman/command_refresh.cpp src/build/libbe/support/Jamfile src/build/libpackage/Jamfile src/build/libroot/Jamfile src/build/libroot/fs.cpp src/build/libroot/remapped_functions.h src/kits/locale/MutableLocaleRoster.cpp src/kits/opengl/GLRendererRoster.cpp src/kits/package/PackageInfo.cpp src/kits/package/PackageInfoSet.cpp src/kits/package/PackageRoster.cpp src/kits/package/PackageVersion.cpp src/kits/package/RepositoryCache.cpp src/kits/package/hpkg/PackageWriterImpl.cpp src/kits/package/hpkg/ReaderImplBase.cpp src/kits/package/hpkg/WriterImplBase.cpp src/kits/print/PrintTransport.cpp src/kits/print/Printer.cpp src/kits/screensaver/ScreenSaverRunner.cpp src/kits/support/StringList.cpp src/kits/tracker/ContainerWindow.cpp src/kits/tracker/DeskWindow.cpp src/kits/tracker/PoseView.cpp src/libs/print/libprint/Transport.cpp src/preferences/printers/AddPrinterDialog.cpp src/preferences/screensaver/ScreenSaverWindow.cpp src/servers/debug/DebugServer.cpp src/servers/input/AddOnManager.cpp src/servers/media_addon/MediaAddonServer.cpp src/system/boot/Jamfile src/system/boot/loader/Jamfile src/system/boot/loader/loader.cpp src/system/boot/loader/vfs.cpp src/system/kernel/fs/vfs.cpp src/system/kernel/fs/vfs_boot.cpp src/system/libroot/os/find_directory.cpp src/system/runtime_loader/runtime_loader.cpp src/tools/package/Jamfile
This commit is contained in:
Ingo Weinhold
@@ -0,0 +1,59 @@
|
||||
/*
|
||||
* Copyright 2011, Haiku, Inc. All Rights Reserved.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef _BUFFERED_DATA_IO_H
|
||||
#define _BUFFERED_DATA_IO_H
|
||||
|
||||
|
||||
#include <DataIO.h>
|
||||
|
||||
|
||||
class BBufferedDataIO : public BDataIO {
|
||||
public:
|
||||
BBufferedDataIO(BDataIO& stream,
|
||||
size_t bufferSize = 65536L,
|
||||
bool ownsStream = true,
|
||||
bool partialReads = false);
|
||||
virtual ~BBufferedDataIO();
|
||||
|
||||
status_t InitCheck() const;
|
||||
|
||||
BDataIO* Stream() const;
|
||||
size_t BufferSize() const;
|
||||
bool OwnsStream() const;
|
||||
void SetOwnsStream(bool ownsStream);
|
||||
status_t Flush();
|
||||
|
||||
// BDataIO interface
|
||||
virtual ssize_t Read(void* buffer, size_t size);
|
||||
virtual ssize_t Write(const void* buffer, size_t size);
|
||||
|
||||
private:
|
||||
BBufferedDataIO(const BBufferedDataIO& other);
|
||||
// not implemented
|
||||
|
||||
virtual status_t _Reserved0(void*);
|
||||
virtual status_t _Reserved1(void*);
|
||||
virtual status_t _Reserved2(void*);
|
||||
virtual status_t _Reserved3(void*);
|
||||
virtual status_t _Reserved4(void*);
|
||||
|
||||
private:
|
||||
BDataIO& fStream;
|
||||
uint8* fBuffer;
|
||||
size_t fBufferSize;
|
||||
size_t fPosition;
|
||||
size_t fSize;
|
||||
|
||||
uint32 _reserved_ints[4];
|
||||
|
||||
bool fDirty;
|
||||
bool fOwnsStream;
|
||||
bool fPartialReads;
|
||||
|
||||
bool _reserved_bools[5];
|
||||
};
|
||||
|
||||
|
||||
#endif // _BUFFERED_DATA_IO_H
|
||||
@@ -47,11 +47,13 @@ extern "C" {
|
||||
PRINT(("%s\t", #OBJ)); \
|
||||
(OBJ).PrintToStream(); \
|
||||
} ((void)0)
|
||||
#define TRACE() _debugPrintf("File: %s, Line: %d, Thread: %ld\n", \
|
||||
__FILE__, __LINE__, find_thread(NULL))
|
||||
#define TRACE() _debugPrintf("File: %s, Line: %d, Thread: %" \
|
||||
B_PRId32 "\n", __FILE__, __LINE__, \
|
||||
find_thread(NULL))
|
||||
|
||||
#define SERIAL_TRACE() _sPrintf("File: %s, Line: %d, Thread: %ld\n", \
|
||||
__FILE__, __LINE__, find_thread(NULL))
|
||||
#define SERIAL_TRACE() _sPrintf("File: %s, Line: %d, Thread: %" \
|
||||
B_PRId32 "\n", __FILE__, __LINE__, \
|
||||
find_thread(NULL))
|
||||
|
||||
#define DEBUGGER(MSG) if (_rtDebugFlag) debugger(MSG)
|
||||
#if !defined(ASSERT)
|
||||
|
||||
@@ -7,11 +7,12 @@
|
||||
|
||||
|
||||
#include <BeBuild.h>
|
||||
#include <Flattenable.h>
|
||||
#include <List.h>
|
||||
#include <String.h>
|
||||
|
||||
|
||||
class BStringList {
|
||||
class BStringList : public BFlattenable {
|
||||
public:
|
||||
BStringList(int32 count = 20);
|
||||
BStringList(const BStringList& other);
|
||||
@@ -25,6 +26,8 @@ public:
|
||||
|
||||
bool Remove(const BString& string,
|
||||
bool ignoreCase = false);
|
||||
bool Remove(const BStringList& list,
|
||||
bool ignoreCase = false);
|
||||
BString Remove(int32 index);
|
||||
bool Remove(int32 index, int32 count);
|
||||
bool Replace(int32 index, const BString& string);
|
||||
@@ -61,6 +64,15 @@ public:
|
||||
bool operator==(const BStringList& other) const;
|
||||
bool operator!=(const BStringList& other) const;
|
||||
|
||||
// BFlattenable
|
||||
virtual bool IsFixedSize() const;
|
||||
virtual type_code TypeCode() const;
|
||||
virtual bool AllowsTypeCode(type_code code) const;
|
||||
virtual ssize_t FlattenedSize() const;
|
||||
virtual status_t Flatten(void* buffer, ssize_t size) const;
|
||||
virtual status_t Unflatten(type_code code, const void* buffer,
|
||||
ssize_t size);
|
||||
|
||||
private:
|
||||
void _IncrementRefCounts() const;
|
||||
void _DecrementRefCounts() const;
|
||||
|
||||
@@ -146,6 +146,17 @@ typedef generic_addr_t generic_size_t;
|
||||
/* time_t */
|
||||
#define B_PRIdTIME B_PRId32
|
||||
#define B_PRIiTIME B_PRIi32
|
||||
/* bigtime_t */
|
||||
#define B_PRIdBIGTIME B_PRId64
|
||||
#define B_PRIiBIGTIME B_PRIi64
|
||||
|
||||
|
||||
/* Printed width of a pointer with the %p format (minus 0x prefix). */
|
||||
#ifdef B_HAIKU_64_BIT
|
||||
# define B_PRINTF_POINTER_WIDTH 16
|
||||
#else
|
||||
# define B_PRINTF_POINTER_WIDTH 8
|
||||
#endif
|
||||
|
||||
|
||||
/* Empty string ("") */
|
||||
|
||||
@@ -52,6 +52,7 @@ enum {
|
||||
B_SIZE_T_TYPE = 'SIZT',
|
||||
B_SSIZE_T_TYPE = 'SSZT',
|
||||
B_STRING_TYPE = 'CSTR',
|
||||
B_STRING_LIST_TYPE = 'STRL',
|
||||
B_TIME_TYPE = 'TIME',
|
||||
B_UINT16_TYPE = 'USHT',
|
||||
B_UINT32_TYPE = 'ULNG',
|
||||
|
||||
@@ -39,6 +39,8 @@ enum {
|
||||
B_ISO15_CONVERSION,
|
||||
B_BIG5_CONVERSION, // Chinese Big5
|
||||
B_GBK_CONVERSION, // Chinese GB18030
|
||||
B_UTF16_CONVERSION, // Unicode UTF-16
|
||||
B_MS_WINDOWS_1250_CONVERSION // Windows Central European Codepage
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user