diff options
author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2008-08-13 04:00:00 +0400 |
---|---|---|
committer | Kornel LesiĆski <kornel@geekhood.net> | 2016-05-28 02:15:56 +0300 |
commit | 173c07e166fdf6fcd20f18ea73008f1b628945df (patch) | |
tree | 13ebea85cdc4c16ae93714ff0627ee9f91ad7e08 /CPP/7zip/Archive/Com/ComIn.cpp | |
parent | 3901bf0ab88106a5b031cba7bc18d60cdebf7eef (diff) |
4.59 beta
Diffstat (limited to 'CPP/7zip/Archive/Com/ComIn.cpp')
-rwxr-xr-x | CPP/7zip/Archive/Com/ComIn.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/CPP/7zip/Archive/Com/ComIn.cpp b/CPP/7zip/Archive/Com/ComIn.cpp index b8dfdb81..74e601c1 100755 --- a/CPP/7zip/Archive/Com/ComIn.cpp +++ b/CPP/7zip/Archive/Com/ComIn.cpp @@ -2,8 +2,8 @@ #include "StdAfx.h" -extern "C" -{ +extern "C" +{ #include "../../../../C/Alloc.h" } @@ -69,8 +69,8 @@ static void ReadItem(Byte *p, CItem &item, bool mode64bit) item.RightDid = GetUi32(p + 72); item.SonDid = GetUi32(p + 76); // item.Flags = GetUi32(p + 96); - GetFileTimeFromMem(p + 100, &item.CreationTime); - GetFileTimeFromMem(p + 108, &item.LastWriteTime); + GetFileTimeFromMem(p + 100, &item.CTime); + GetFileTimeFromMem(p + 108, &item.MTime); item.Sid = GetUi32(p + 116); item.Size = GetUi32(p + 120); if (mode64bit) @@ -127,7 +127,7 @@ static UString CompoundNameToFileName(const UString &s) } else res += c; - } + } return res; } @@ -219,7 +219,7 @@ HRESULT OpenArchive(IInStream *inStream, CDatabase &db) db.SectorSizeBits = sectorSizeBits; db.MiniSectorSizeBits = miniSectorSizeBits; - if (sectorSizeBits > 28 || miniSectorSizeBits > 28 || + if (sectorSizeBits > 28 || miniSectorSizeBits > 28 || sectorSizeBits < 7 || miniSectorSizeBits < 2 || miniSectorSizeBits > sectorSizeBits) return S_FALSE; UInt32 numSectorsForFAT = GetUi32(p + 0x2C); |