mirror of
https://github.com/VCMP-SqMod/SqMod.git
synced 2026-11-15 00:07:08 +01:00
Update POCO library.
This commit is contained in:
1 parent
8d15f4b6e9
commit
233fc103f9
2521 files changed
+257092
-72789
No files matched your search
+5
-5
@@ -28,13 +28,13 @@ namespace Zip {
|
||||
|
||||
|
||||
class Zip_API AutoDetectStreamBuf: public Poco::BufferedStreamBuf
|
||||
/// AutoDetectStreamBuf automatically detects the end of a stream using the
|
||||
/// AutoDetectStreamBuf automatically detects the end of a stream using the
|
||||
/// Data Descriptor signature.
|
||||
{
|
||||
public:
|
||||
AutoDetectStreamBuf(std::istream& in, const std::string& prefix, const std::string& postfix, bool reposition, Poco::UInt32 start, bool needsZip64);
|
||||
/// Creates the AutoDetectStream.
|
||||
|
||||
/// Creates the AutoDetectStream.
|
||||
|
||||
~AutoDetectStreamBuf();
|
||||
/// Destroys the AutoDetectStream.
|
||||
|
||||
@@ -43,7 +43,7 @@ protected:
|
||||
int writeToDevice(const char* buffer, std::streamsize length);
|
||||
|
||||
private:
|
||||
enum
|
||||
enum
|
||||
{
|
||||
STREAM_BUFFER_SIZE = 1024
|
||||
};
|
||||
@@ -83,7 +83,7 @@ protected:
|
||||
|
||||
|
||||
class Zip_API AutoDetectInputStream: public AutoDetectIOS, public std::istream
|
||||
/// AutoDetectInputStream automatically detects the end of a stream using the
|
||||
/// AutoDetectInputStream automatically detects the end of a stream using the
|
||||
/// Data Descriptor signature.
|
||||
{
|
||||
public:
|
||||
|
||||
+2
-2
@@ -66,7 +66,7 @@ public:
|
||||
|
||||
const std::string& getZipComment() const;
|
||||
/// Returns the Zip file comment.
|
||||
|
||||
|
||||
ZipArchive close();
|
||||
/// Finalizes the ZipArchive, closes it.
|
||||
|
||||
@@ -82,7 +82,7 @@ public:
|
||||
/// - jpg
|
||||
/// - jpeg
|
||||
/// - png
|
||||
|
||||
|
||||
const std::set<std::string>& getStoreExtensions() const;
|
||||
/// Returns the file extensions for which the CM_STORE compression method
|
||||
/// is used if CM_AUTO is specified in addFile() or addRecursive().
|
||||
|
||||
+1
-1
@@ -49,7 +49,7 @@ public:
|
||||
/// Creates the Decompress. Note that istream must be good and at the very beginning of the file!
|
||||
/// Calling decompressAllFiles will cause the stream to be in state failed once the zip file is processed.
|
||||
/// outputDir must be a directory. If it doesn't exist yet, it will be automatically created.
|
||||
/// If flattenDirs is set to true, the directory structure of the zip file is not recreated.
|
||||
/// If flattenDirs is set to true, the directory structure of the zip file is not recreated.
|
||||
/// Instead, all files are extracted into one single directory.
|
||||
|
||||
~Decompress();
|
||||
|
||||
+4
-4
@@ -34,12 +34,12 @@ class Zip_API PartialStreamBuf: public Poco::BufferedStreamBuf
|
||||
{
|
||||
public:
|
||||
PartialStreamBuf(std::istream& in, std::ios::pos_type start, std::ios::pos_type end, const std::string& prefix, const std::string& postfix, bool initStream);
|
||||
/// Creates the PartialStream.
|
||||
/// Creates the PartialStream.
|
||||
/// If initStream is true the status of the stream will be cleared on the first access, and the stream will be repositioned
|
||||
/// to position start
|
||||
|
||||
PartialStreamBuf(std::ostream& out, std::size_t start, std::size_t end, bool initStream);
|
||||
/// Creates the PartialStream.
|
||||
/// Creates the PartialStream.
|
||||
/// If initStream is true the status of the stream will be cleared on the first access.
|
||||
/// start and end acts as offset values for the written content. A start value greater than zero,
|
||||
/// means that the first bytes are not written but discarded instead,
|
||||
@@ -62,7 +62,7 @@ protected:
|
||||
int writeToDevice(const char* buffer, std::streamsize length);
|
||||
|
||||
private:
|
||||
enum
|
||||
enum
|
||||
{
|
||||
STREAM_BUFFER_SIZE = 1024
|
||||
};
|
||||
@@ -153,7 +153,7 @@ public:
|
||||
/// Examples:
|
||||
/// start = 3; end = 1
|
||||
/// write("hello", 5) -> "l"
|
||||
///
|
||||
///
|
||||
/// start = 3; end = 0
|
||||
/// write("hello", 5) -> "lo"
|
||||
|
||||
|
||||
+1
-1
@@ -78,7 +78,7 @@ private:
|
||||
/// Stores directory info for all found disks
|
||||
DirectoryInfos64 _disks64;
|
||||
/// Stores directory info for all found disks
|
||||
|
||||
|
||||
static const std::string EMPTY_COMMENT;
|
||||
|
||||
friend class Compress;
|
||||
|
||||
+4
-4
@@ -134,7 +134,7 @@ public:
|
||||
~ZipArchiveInfo64();
|
||||
/// Destroys the ZipArchiveInfo64.
|
||||
|
||||
void getVersionMadeBy(int& major, int& minor);
|
||||
void getVersionMadeBy(int& major, int& minor);
|
||||
/// The ZIP version used to create the file
|
||||
|
||||
void getRequiredVersion(int& major, int& minor);
|
||||
@@ -157,7 +157,7 @@ public:
|
||||
|
||||
std::streamoff getCentralDirectoryOffset() const;
|
||||
/// Returns the offset of the central directory from beginning of first disk
|
||||
|
||||
|
||||
std::streamoff getHeaderOffset() const;
|
||||
/// Returns the offset of the header in relation to the begin of this disk
|
||||
|
||||
@@ -175,7 +175,7 @@ public:
|
||||
|
||||
void setHeaderOffset(std::streamoff val);
|
||||
/// Sets the offset of the header in relation to the begin of this disk
|
||||
|
||||
|
||||
void setTotalNumberOfDisks(Poco::UInt32 val);
|
||||
/// Sets the offset of the central directory from beginning of first disk
|
||||
|
||||
@@ -217,7 +217,7 @@ private:
|
||||
ENDOFCENTRALDIROFFSET_SIZE = 8,
|
||||
TOTALNUMBEROFENDDISKS_POS = ENDOFCENTRALDIROFFSET_POS + ENDOFCENTRALDIROFFSET_SIZE,
|
||||
TOTALNUMBEROFENDDISKS_SIZE = 4,
|
||||
|
||||
|
||||
FULL_LOCATOR_SIZE = 20
|
||||
};
|
||||
|
||||
|
||||
+5
-6
@@ -22,7 +22,6 @@
|
||||
#include "Poco/Zip/ZipCommon.h"
|
||||
#include "Poco/Zip/ZipUtil.h"
|
||||
|
||||
|
||||
namespace Poco {
|
||||
namespace Zip {
|
||||
|
||||
@@ -121,7 +120,7 @@ private:
|
||||
void setFileNameLength(Poco::UInt16 size);
|
||||
|
||||
void setFileName(const std::string& str);
|
||||
|
||||
|
||||
void setExternalFileAttributes(Poco::UInt32 attrs);
|
||||
|
||||
void parse(std::istream& in, bool assumeHeaderRead);
|
||||
@@ -143,7 +142,7 @@ private:
|
||||
Poco::UInt16 getFileCommentLength() const;
|
||||
|
||||
Poco::UInt32 getExternalFileAttributes() const;
|
||||
|
||||
|
||||
void setUnixAttributes();
|
||||
|
||||
private:
|
||||
@@ -194,8 +193,8 @@ private:
|
||||
EXTRA_DATA_OFFSET_SIZE = 8,
|
||||
FULLEXTRA_DATA_SIZE = 28
|
||||
};
|
||||
|
||||
enum
|
||||
|
||||
enum
|
||||
{
|
||||
DEFAULT_UNIX_FILE_MODE = 0640,
|
||||
DEFAULT_UNIX_DIR_MODE = 0755
|
||||
@@ -455,7 +454,7 @@ inline void ZipFileInfo::setCompressionLevel(ZipCommon::CompressionLevel cl)
|
||||
{
|
||||
// bit 1 and 2 indicate the level
|
||||
Poco::UInt16 val = static_cast<Poco::UInt16>(cl);
|
||||
val <<= 1;
|
||||
val <<= 1;
|
||||
Poco::UInt16 mask = 0xfff9;
|
||||
_rawInfo[GENERAL_PURPOSE_POS] = ((_rawInfo[GENERAL_PURPOSE_POS] & mask) | val);
|
||||
}
|
||||
|
||||
+2
-2
@@ -61,10 +61,10 @@ public:
|
||||
/// Adds a file to the zip file.
|
||||
|
||||
ZipArchive commit();
|
||||
/// Commits all changes and re-creates the Zip File with the changes applied.
|
||||
/// Commits all changes and re-creates the Zip File with the changes applied.
|
||||
/// Returns the ZipArchive for the newly created archive
|
||||
///
|
||||
/// Changes will be first written to a temporary file,
|
||||
/// Changes will be first written to a temporary file,
|
||||
/// then the originalfile will be either deleted or renamed to .bak,
|
||||
/// then, the temp file will be renamed to the original zip file name.
|
||||
|
||||
|
||||
+1
-1
@@ -41,7 +41,7 @@ class Zip_API ZipStreamBuf: public Poco::BufferedStreamBuf
|
||||
public:
|
||||
ZipStreamBuf(std::istream& istr, const ZipLocalFileHeader& fileEntry, bool reposition);
|
||||
/// Creates the ZipStreamBuf. Set reposition to false, if you do on-the-fly decompression.
|
||||
|
||||
|
||||
ZipStreamBuf(std::ostream& ostr, ZipLocalFileHeader& fileEntry, bool reposition);
|
||||
/// Creates the ZipStreamBuf. Set reposition to false, if you do on-the-fly compression.
|
||||
|
||||
|
||||
+1
-1
@@ -38,7 +38,7 @@ public:
|
||||
static Poco::UInt32 get32BitValue(const char* pVal, const Poco::UInt32 pos);
|
||||
|
||||
static Poco::UInt64 get64BitValue(const char* pVal, const Poco::UInt32 pos);
|
||||
|
||||
|
||||
static void set16BitValue(const Poco::UInt16 val, char* pVal, const Poco::UInt32 pos);
|
||||
|
||||
static void set32BitValue(const Poco::UInt32 val, char* pVal, const Poco::UInt32 pos);
|
||||
|
||||
Reference in new issue
Block a user