seven-zip 1.4.2 → 1.7.0.rc1

data/ext/p7zip/CPP/7zip/Archive/Cab/CabIn.h

@@ -3,96 +3,101 @@
 #ifndef __ARCHIVE_CAB_IN_H
 #define __ARCHIVE_CAB_IN_H
 
-#include "../../IStream.h"
+#include "../../../Common/MyBuffer.h"
+#include "../../../Common/MyCom.h"
+
 #include "../../Common/InBuffer.h"
-#include "CabHeader.h"
+
 #include "CabItem.h"
 
 namespace NArchive {
 namespace NCab {
 
-class CInArchiveException
-{
-public:
-  enum CCauseType
-  {
-    kUnexpectedEndOfArchive = 0,
-    kIncorrectArchive,
-    kUnsupported
-  } Cause;
-  CInArchiveException(CCauseType cause) : Cause(cause) {}
-};
-
-struct COtherArchive
+struct COtherArc
 {
   AString FileName;
   AString DiskName;
+  
+  void Clear()
+  {
+    FileName.Empty();
+    DiskName.Empty();
+  }
 };
 
-struct CArchiveInfo
-{
-  Byte VersionMinor; /* cabinet file format version, minor */
-  Byte VersionMajor; /* cabinet file format version, major */
-  UInt16 NumFolders; /* number of CFFOLDER entries in this cabinet */
-  UInt16 NumFiles;   /* number of CFFILE entries in this cabinet */
-  UInt16 Flags;      /* cabinet file option indicators */
-  UInt16 SetID;      /* must be the same for all cabinets in a set */
-  UInt16 CabinetNumber; /* number of this cabinet file in a set */
-
-  bool ReserveBlockPresent() const { return (Flags & NHeader::NArchive::NFlags::kReservePresent) != 0; }
-
-  bool IsTherePrev() const { return (Flags & NHeader::NArchive::NFlags::kPrevCabinet) != 0; }
-  bool IsThereNext() const { return (Flags & NHeader::NArchive::NFlags::kNextCabinet) != 0; }
 
-  UInt16 PerCabinetAreaSize; // (optional) size of per-cabinet reserved area
-  Byte PerFolderAreaSize;    // (optional) size of per-folder reserved area
-  Byte PerDataBlockAreaSize; // (optional) size of per-datablock reserved area
-
-  Byte GetDataBlockReserveSize() const { return (Byte)(ReserveBlockPresent() ? PerDataBlockAreaSize : 0); }
-
-  COtherArchive PrevArc;
-  COtherArchive NextArc;
-
-  CArchiveInfo()
+struct CArchInfo
+{
+  Byte VersionMinor; // cabinet file format version, minor
+  Byte VersionMajor; // cabinet file format version, major
+  UInt32 NumFolders; // number of CFFOLDER entries in this cabinet
+  UInt32 NumFiles;   // number of CFFILE entries in this cabinet
+  UInt32 Flags;      // cabinet file option indicators
+  UInt32 SetID;      // must be the same for all cabinets in a set
+  UInt32 CabinetNumber; // number of this cabinet file in a set
+
+  UInt16 PerCabinet_AreaSize; // (optional) size of per-cabinet reserved area
+  Byte PerFolder_AreaSize;    // (optional) size of per-folder reserved area
+  Byte PerDataBlock_AreaSize; // (optional) size of per-datablock reserved area
+
+  COtherArc PrevArc; // prev link can skip some volumes !!!
+  COtherArc NextArc;
+
+  bool ReserveBlockPresent() const { return (Flags & NHeader::NArcFlags::kReservePresent) != 0; }
+  bool IsTherePrev() const { return (Flags & NHeader::NArcFlags::kPrevCabinet) != 0; }
+  bool IsThereNext() const { return (Flags & NHeader::NArcFlags::kNextCabinet) != 0; }
+  Byte GetDataBlockReserveSize() const { return (Byte)(ReserveBlockPresent() ? PerDataBlock_AreaSize : 0); }
+
+  CArchInfo()
   {
-    Clear();
+    PerCabinet_AreaSize = 0;
+    PerFolder_AreaSize = 0;
+    PerDataBlock_AreaSize = 0;
   }
 
   void Clear()
   {
-    PerCabinetAreaSize = 0;
-    PerFolderAreaSize = 0;
-    PerDataBlockAreaSize = 0;
+    PerCabinet_AreaSize = 0;
+    PerFolder_AreaSize = 0;
+    PerDataBlock_AreaSize = 0;
+
+    PrevArc.Clear();
+    NextArc.Clear();
   }
 };
 
-struct CInArchiveInfo: public CArchiveInfo
+
+struct CInArcInfo: public CArchInfo
 {
-  UInt32 Size; /* size of this cabinet file in bytes */
+  UInt32 Size; // size of this cabinet file in bytes
   UInt32 FileHeadersOffset; // offset of the first CFFILE entry
+
+  bool Parse(const Byte *p);
 };
 
 
 struct CDatabase
 {
-  UInt64 StartPosition;
-  CInArchiveInfo ArchiveInfo;
-  CObjectVector<CFolder> Folders;
+  CRecordVector<CFolder> Folders;
   CObjectVector<CItem> Items;
+  UInt64 StartPosition;
+  CInArcInfo ArcInfo;
   
   void Clear()
   {
-    ArchiveInfo.Clear();
+    ArcInfo.Clear();
     Folders.Clear();
     Items.Clear();
   }
+  
   bool IsTherePrevFolder() const
   {
-    for (int i = 0; i < Items.Size(); i++)
+    FOR_VECTOR (i, Items)
       if (Items[i].ContinuedFromPrev())
         return true;
     return false;
   }
+  
   int GetNumberOfNewFolders() const
   {
     int res = Folders.Size();
@@ -100,36 +105,39 @@ struct CDatabase
       res--;
     return res;
   }
-  UInt32 GetFileOffset(int index) const { return Items[index].Offset; }
-  UInt32 GetFileSize(int index) const { return Items[index].Size; }
 };
 
+
 struct CDatabaseEx: public CDatabase
 {
   CMyComPtr<IInStream> Stream;
 };
 
+
 struct CMvItem
 {
-  int VolumeIndex;
-  int ItemIndex;
+  unsigned VolumeIndex;
+  unsigned ItemIndex;
 };
 
+
 class CMvDatabaseEx
 {
-  bool AreItemsEqual(int i1, int i2);
+  bool AreItemsEqual(unsigned i1, unsigned i2);
+
 public:
   CObjectVector<CDatabaseEx> Volumes;
   CRecordVector<CMvItem> Items;
-  CRecordVector<int> StartFolderOfVol;
-  CRecordVector<int> FolderStartFileIndex;
-  
+  CRecordVector<int> StartFolderOfVol; // can be negative
+  CRecordVector<unsigned> FolderStartFileIndex;
+
   int GetFolderIndex(const CMvItem *mvi) const
   {
     const CDatabaseEx &db = Volumes[mvi->VolumeIndex];
     return StartFolderOfVol[mvi->VolumeIndex] +
         db.Items[mvi->ItemIndex].GetFolderIndex(db.Folders.Size());
   }
+
   void Clear()
   {
     Volumes.Clear();
@@ -137,23 +145,30 @@ public:
     StartFolderOfVol.Clear();
     FolderStartFileIndex.Clear();
   }
+  
   void FillSortAndShrink();
   bool Check();
 };
 
+
 class CInArchive
 {
-  CInBuffer inBuffer;
+  CInBufferBase _inBuffer;
+  CByteBuffer _tempBuf;
 
-  Byte Read8();
-  UInt16 Read16();
-  UInt32 Read32();
-  AString SafeReadName();
-  void Skip(UInt32 size);
-  void ReadOtherArchive(COtherArchive &oa);
+  void Skip(unsigned size);
+  void Read(Byte *data, unsigned size);
+  void ReadName(AString &s);
+  void ReadOtherArc(COtherArc &oa);
+  HRESULT Open2(CDatabaseEx &db, const UInt64 *searchHeaderSizeLimit);
 
 public:
-  HRESULT Open(const UInt64 *searchHeaderSizeLimit, CDatabaseEx &db);
+  bool IsArc;
+  bool ErrorInNames;
+  bool UnexpectedEnd;
+  bool HeaderError;
+
+  HRESULT Open(CDatabaseEx &db, const UInt64 *searchHeaderSizeLimit);
 };
   
 }}

data/ext/p7zip/CPP/7zip/Archive/Cab/CabItem.h

@@ -3,20 +3,23 @@
 #ifndef __ARCHIVE_CAB_ITEM_H
 #define __ARCHIVE_CAB_ITEM_H
 
-#include "Common/Types.h"
-#include "Common/MyString.h"
+#include "../../../Common/MyString.h"
+
 #include "CabHeader.h"
 
 namespace NArchive {
 namespace NCab {
 
+const unsigned kNumMethodsMax = 16;
+
 struct CFolder
 {
   UInt32 DataStart; // offset of the first CFDATA block in this folder
   UInt16 NumDataBlocks; // number of CFDATA blocks in this folder
-  Byte CompressionTypeMajor;
-  Byte CompressionTypeMinor;
-  Byte GetCompressionMethod() const { return (Byte)(CompressionTypeMajor & 0xF); }
+  Byte MethodMajor;
+  Byte MethodMinor;
+  
+  Byte GetMethod() const { return (Byte)(MethodMajor & 0xF); }
 };
 
 struct CItem
@@ -25,35 +28,35 @@ struct CItem
   UInt32 Offset;
   UInt32 Size;
   UInt32 Time;
-  UInt16 FolderIndex;
+  UInt32 FolderIndex;
   UInt16 Flags;
   UInt16 Attributes;
   
   UInt64 GetEndOffset() const { return (UInt64)Offset + Size; }
-  UInt32 GetWinAttributes() const { return (Attributes & ~NHeader::kFileNameIsUTFAttributeMask); }
-  bool IsNameUTF() const { return (Attributes & NHeader::kFileNameIsUTFAttributeMask) != 0; }
+  UInt32 GetWinAttrib() const { return (UInt32)Attributes & ~(UInt32)NHeader::kFileNameIsUtf8_Mask; }
+  bool IsNameUTF() const { return (Attributes & NHeader::kFileNameIsUtf8_Mask) != 0; }
   bool IsDir() const { return (Attributes & FILE_ATTRIBUTE_DIRECTORY) != 0; }
 
   bool ContinuedFromPrev() const
   {
     return
-      (FolderIndex == NHeader::NFolderIndex::kContinuedFromPrev) ||
-      (FolderIndex == NHeader::NFolderIndex::kContinuedPrevAndNext);
+      FolderIndex == NHeader::NFolderIndex::kContinuedFromPrev ||
+      FolderIndex == NHeader::NFolderIndex::kContinuedPrevAndNext;
   }
   
   bool ContinuedToNext() const
   {
     return
-      (FolderIndex == NHeader::NFolderIndex::kContinuedToNext) ||
-      (FolderIndex == NHeader::NFolderIndex::kContinuedPrevAndNext);
+      FolderIndex == NHeader::NFolderIndex::kContinuedToNext ||
+      FolderIndex == NHeader::NFolderIndex::kContinuedPrevAndNext;
   }
 
-  int GetFolderIndex(int numFolders) const
+  int GetFolderIndex(unsigned numFolders) const
   {
     if (ContinuedFromPrev())
       return 0;
     if (ContinuedToNext())
-      return (numFolders - 1);
+      return numFolders - 1;
     return FolderIndex;
   }
 };

data/ext/p7zip/CPP/7zip/Archive/Cab/CabRegister.cpp

@@ -5,9 +5,15 @@
 #include "../../Common/RegisterArc.h"
 
 #include "CabHandler.h"
-static IInArchive *CreateArc() { return new NArchive::NCab::CHandler; }
 
-static CArcInfo g_ArcInfo =
-  { L"Cab", L"cab", 0, 8, { 0x4D, 0x53, 0x43, 0x46 }, 4, false, CreateArc, 0 };
+namespace NArchive {
+namespace NCab {
 
-REGISTER_ARC(Cab)
+REGISTER_ARC_I(
+  "Cab", "cab", 0, 8,
+  NHeader::kMarker,
+  0,
+  NArcInfoFlags::kFindSignature,
+  NULL)
+
+}}