* contrib/hbziparch/_features.h
* contrib/hbziparch/_platform.h
* contrib/hbziparch/Aes.cpp
* contrib/hbziparch/Aes.h
* contrib/hbziparch/BaseLibCompressor.cpp
* contrib/hbziparch/BaseLibCompressor.h
* contrib/hbziparch/BytesWriter.h
* contrib/hbziparch/Bzip2Compressor.cpp
* contrib/hbziparch/Bzip2Compressor.h
* contrib/hbziparch/DeflateCompressor.cpp
* contrib/hbziparch/DeflateCompressor.h
* contrib/hbziparch/DirEnumerator.cpp
* contrib/hbziparch/DirEnumerator.h
* contrib/hbziparch/FileFilter.cpp
* contrib/hbziparch/FileFilter.h
* contrib/hbziparch/FileInfo.h
* contrib/hbziparch/Hmac.cpp
* contrib/hbziparch/Hmac.h
* contrib/hbziparch/RandomPool.cpp
* contrib/hbziparch/RandomPool.h
* contrib/hbziparch/Sha1.cpp
* contrib/hbziparch/Sha1.h
* contrib/hbziparch/std_mfc.h
* contrib/hbziparch/std_stl.h
* contrib/hbziparch/Wildcard.cpp
* contrib/hbziparch/Wildcard.h
* contrib/hbziparch/ZipAbstractFile.h
* contrib/hbziparch/ZipAesCryptograph.cpp
* contrib/hbziparch/ZipAesCryptograph.h
* contrib/hbziparch/ZipArchive.cpp
* contrib/hbziparch/ZipArchive.h
* contrib/hbziparch/ZipAutoBuffer.cpp
* contrib/hbziparch/ZipAutoBuffer.h
* contrib/hbziparch/ZipBaseException.h
* contrib/hbziparch/ZipCallback.h
* contrib/hbziparch/ZipCallbackProvider.h
* contrib/hbziparch/ZipCentralDir.cpp
* contrib/hbziparch/ZipCentralDir.h
* contrib/hbziparch/ZipCollections.h
* contrib/hbziparch/ZipCollections_mfc.h
* contrib/hbziparch/ZipCollections_stl.h
* contrib/hbziparch/ZipCompatibility.cpp
* contrib/hbziparch/ZipCompatibility.h
* contrib/hbziparch/ZipCompressor.cpp
* contrib/hbziparch/ZipCompressor.h
* contrib/hbziparch/ZipCrc32Cryptograph.cpp
* contrib/hbziparch/ZipCrc32Cryptograph.h
* contrib/hbziparch/ZipCryptograph.cpp
* contrib/hbziparch/ZipCryptograph.h
* contrib/hbziparch/ZipException.cpp
* contrib/hbziparch/ZipException.h
* contrib/hbziparch/ZipExtraData.cpp
* contrib/hbziparch/ZipExtraData.h
* contrib/hbziparch/ZipExtraField.cpp
* contrib/hbziparch/ZipExtraField.h
* contrib/hbziparch/ZipFile.h
* contrib/hbziparch/ZipFile_mfc.cpp
* contrib/hbziparch/ZipFile_mfc.h
* contrib/hbziparch/ZipFile_stl.cpp
* contrib/hbziparch/ZipFile_stl.h
* contrib/hbziparch/ZipFileHeader.cpp
* contrib/hbziparch/ZipFileHeader.h
* contrib/hbziparch/ZipFileMapping.h
* contrib/hbziparch/ZipFileMapping_lnx.h
* contrib/hbziparch/ZipFileMapping_win.h
* contrib/hbziparch/ZipMemFile.cpp
* contrib/hbziparch/ZipMemFile.h
* contrib/hbziparch/ZipMutex.h
* contrib/hbziparch/ZipMutex_lnx.h
* contrib/hbziparch/ZipMutex_win.h
* contrib/hbziparch/ZipPathComponent.h
* contrib/hbziparch/ZipPlatform.h
* contrib/hbziparch/ZipPlatformComm.cpp
* contrib/hbziparch/ZipStorage.cpp
* contrib/hbziparch/ZipStorage.h
* contrib/hbziparch/ZipString.h
* contrib/hbziparch/ZipString_mfc.h
* contrib/hbziparch/ZipString_stl.h
* contrib/hbziparch/ZipStringStoreSettings.h
+ ZipArchive lib update finished.
; Pass 2/2
; Please test.
89 lines
2.1 KiB
C++
89 lines
2.1 KiB
C++
////////////////////////////////////////////////////////////////////////////////
|
|
// This source file is part of the ZipArchive library source distribution and
|
|
// is Copyrighted 2000 - 2007 by Artpol Software - Tadeusz Dracz
|
|
//
|
|
// This program is free software; you can redistribute it and/or
|
|
// modify it under the terms of the GNU General Public License
|
|
// as published by the Free Software Foundation; either version 2
|
|
// of the License, or (at your option) any later version.
|
|
//
|
|
// For the licensing details refer to the License.txt file.
|
|
//
|
|
// Web Site: http://www.artpol-software.com
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
#include "stdafx.h"
|
|
#include "ZipExtraField.h"
|
|
|
|
bool CZipExtraField::Read(CZipStorage *pStorage, WORD uSize)
|
|
{
|
|
if (uSize == 0)
|
|
return true;
|
|
Clear();
|
|
CZipAutoBuffer buffer;
|
|
buffer.Allocate(uSize);
|
|
pStorage->Read(buffer, uSize, true);
|
|
char* position = (char*) buffer;
|
|
do
|
|
{
|
|
CZipExtraData* pExtra = new CZipExtraData();
|
|
if (!pExtra->Read(position, uSize))
|
|
{
|
|
delete pExtra;
|
|
return false;
|
|
}
|
|
int totalSize = pExtra->GetTotalSize();
|
|
if (totalSize > uSize || totalSize < 0)
|
|
return false;
|
|
position += totalSize;
|
|
uSize = (WORD)(uSize - totalSize);
|
|
Add(pExtra);
|
|
}
|
|
while (uSize > 0);
|
|
return true;
|
|
}
|
|
|
|
|
|
void CZipExtraField::Write(char* buffer)const
|
|
{
|
|
int offset = 0;
|
|
for (int i = 0; i < GetCount(); i++)
|
|
offset += GetAt(i)->Write(buffer + offset);
|
|
}
|
|
|
|
int CZipExtraField::GetTotalSize()const
|
|
{
|
|
int total = 0;
|
|
for (int i = 0; i < GetCount(); i++)
|
|
total += GetAt(i)->GetTotalSize();
|
|
return total;
|
|
}
|
|
|
|
void CZipExtraField::RemoveInternalHeaders()
|
|
{
|
|
for (int i = GetCount() - 1; i >= 0; i--)
|
|
{
|
|
WORD headerID = GetAt(i)->GetHeaderID();
|
|
if (
|
|
headerID == ZIP_EXTRA_ZARCH_NAME)
|
|
RemoveAt(i);
|
|
}
|
|
}
|
|
|
|
CZipExtraData* CZipExtraField::Lookup(WORD headerID, int& index) const
|
|
{
|
|
// we can do a non-efficient search here
|
|
// usually the number of extra fields is low, if any
|
|
for (int i = 0; i < GetCount(); i++)
|
|
{
|
|
CZipExtraData* pExtra = GetAt(i);
|
|
if (pExtra->m_uHeaderID == headerID)
|
|
{
|
|
index = i;
|
|
return pExtra;
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|
|
|