xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-15 04:11:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

4.27 beta

Browse Source
This commit is contained in:
Igor Pavlov
2005-09-21 00:00:00 +00:00
committed by Kornel Lesiński
parent 31e7b924e8
commit d66cf2fcf3
393 changed files with 17345 additions and 4743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
7zip/Archive/cpio/CpioIn.cpp
View File

@@ -4,8 +4,11 @@
#include "CpioIn.h"
#include "Common/StringToInt.h"
#include "Windows/Defs.h"
#include "../../Common/StreamUtils.h"
#include "CpioHeader.h"
namespace NArchive {
@@ -13,7 +16,7 @@ namespace NCpio {
HRESULT CInArchive::ReadBytes(void *data, UInt32 size, UInt32 &processedSize)
{
RINOK(m_Stream->Read(data, size, &processedSize));
RINOK(ReadStream(m_Stream, data, size, &processedSize));
m_Position += processedSize;
return S_OK;
}
@@ -75,24 +78,37 @@ bool CInArchive::ReadNumber(UInt32 &resultValue)
return true;
}
bool CInArchive::ReadOctNumber(int size, UInt32 &resultValue)
static bool OctalToNumber(const char *s, UInt64 &res)
{
char s[32];
int i;
for (i = 0; i < size && i < 32; i++)
s[i] = char(ReadByte());
s[i] = 0;
char *endPtr;
resultValue = strtoul(s, &endPtr, 8);
return true;
const char *end;
res = ConvertOctStringToUInt64(s, &end);
return (*end == ' ' || *end == 0);
}
#define GetFromHex(y) { if (!ReadNumber(y)) return E_FAIL; }
#define GetFromOct6(y) { if (!ReadOctNumber(6, y)) return E_FAIL; }
#define GetFromOct11(y) { if (!ReadOctNumber(11, y)) return E_FAIL; }
static bool OctalToNumber32(const char *s, UInt32 &res)
{
UInt64 res64;
if (!OctalToNumber(s, res64))
return false;
res = (UInt32)res64;
return (res64 <= 0xFFFFFFFF);
}
static unsigned short ConvertValue(
unsigned short value, bool convert)
bool CInArchive::ReadOctNumber(int size, UInt32 &resultValue)
{
char sz[32 + 4];
int i;
for (i = 0; i < size && i < 32; i++)
sz[i] = (char)ReadByte();
sz[i] = 0;
return OctalToNumber32(sz, resultValue);
}
#define GetFromHex(y) { if (!ReadNumber(y)) return S_FALSE; }
#define GetFromOct6(y) { if (!ReadOctNumber(6, y)) return S_FALSE; }
#define GetFromOct11(y) { if (!ReadOctNumber(11, y)) return S_FALSE; }
static unsigned short ConvertValue(unsigned short value, bool convert)
{
if (!convert)
return value;
@@ -109,13 +125,6 @@ static UInt32 GetAlignedSize(UInt32 size, UInt32 align)
HRESULT CInArchive::GetNextItem(bool &filled, CItemEx &item)
{
/*
union
{
NFileHeader::CRecord record;
NFileHeader::CRecord2 record2;
};
*/
filled = false;
UInt32 processedSize;

4
7zip/Archive/cpio/DllExports.cpp
View File

@@ -8,9 +8,9 @@
#include "CpioHandler.h"
#include "../../ICoder.h"
// {23170F69-40C1-278A-1000-000110080000}
// {23170F69-40C1-278A-1000-000110ED0000}
DEFINE_GUID(CLSID_CCpioHandler,
0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x10, 0x08, 0x00, 0x00);
0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x10, 0xED, 0x00, 0x00);
extern "C"
BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)

16
7zip/Archive/cpio/cpio.dsp
View File

@@ -150,6 +150,14 @@ SOURCE=..\..\..\Common\StringConvert.h
# End Source File
# Begin Source File
SOURCE=..\..\..\Common\StringToInt.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\Common\StringToInt.h
# End Source File
# Begin Source File
SOURCE=..\..\..\Common\Vector.cpp
# End Source File
# Begin Source File
@@ -244,6 +252,14 @@ SOURCE=..\..\Common\ProgressUtils.cpp
SOURCE=..\..\Common\ProgressUtils.h
# End Source File
# Begin Source File
SOURCE=..\..\Common\StreamUtils.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Common\StreamUtils.h
# End Source File
# End Group
# End Target
# End Project