seven-zip 1.4.2 → 1.7.0.rc1

data/ext/p7zip/CPP/7zip/Archive/Tar/TarHandlerOut.cpp

@@ -2,11 +2,14 @@
 
 #include "StdAfx.h"
 
-#include "Common/ComTry.h"
-#include "Common/StringConvert.h"
+#include "../../../Common/ComTry.h"
+#include "../../../Common/Defs.h"
+#include "../../../Common/MyLinux.h"
+#include "../../../Common/StringConvert.h"
+#include "../../../Common/UTFConvert.h"
 
-#include "Windows/PropVariant.h"
-#include "Windows/Time.h"
+#include "../../../Windows/PropVariant.h"
+#include "../../../Windows/TimeUtils.h"
 
 #include "TarHandler.h"
 #include "TarUpdate.h"
@@ -22,36 +25,76 @@ STDMETHODIMP CHandler::GetFileTimeType(UInt32 *type)
   return S_OK;
 }
 
-static HRESULT GetPropString(IArchiveUpdateCallback *callback, UInt32 index, PROPID propId, AString &res)
+HRESULT GetPropString(IArchiveUpdateCallback *callback, UInt32 index, PROPID propId,
+    AString &res, UINT codePage, bool convertSlash = false)
 {
   NCOM::CPropVariant prop;
   RINOK(callback->GetProperty(index, propId, &prop));
+  
   if (prop.vt == VT_BSTR)
-    res = UnicodeStringToMultiByte(prop.bstrVal, CP_OEMCP);
+  {
+    UString s = prop.bstrVal;
+    if (convertSlash)
+      s = NItemName::MakeLegalName(s);
+
+    if (codePage == CP_UTF8)
+    {
+      ConvertUnicodeToUTF8(s, res);
+      // if (!ConvertUnicodeToUTF8(s, res)) // return E_INVALIDARG;
+    }
+    else
+      UnicodeStringToMultiByte2(res, s, codePage);
+  }
   else if (prop.vt != VT_EMPTY)
     return E_INVALIDARG;
+
   return S_OK;
 }
 
+
+// sort old files with original order.
+
+static int CompareUpdateItems(void *const *p1, void *const *p2, void *)
+{
+  const CUpdateItem &u1 = *(*((const CUpdateItem **)p1));
+  const CUpdateItem &u2 = *(*((const CUpdateItem **)p2));
+  if (!u1.NewProps)
+  {
+    if (u2.NewProps)
+      return -1;
+    return MyCompare(u1.IndexInArc, u2.IndexInArc);
+  }
+  if (!u2.NewProps)
+    return 1;
+  return MyCompare(u1.IndexInClient, u2.IndexInClient);
+}
+
+
 STDMETHODIMP CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numItems,
     IArchiveUpdateCallback *callback)
 {
   COM_TRY_BEGIN
-  if ((_stream && !_errorMessage.IsEmpty()) || _seqStream)
+
+  if ((_stream && (_error != k_ErrorType_OK /* || _isSparse */)) || _seqStream)
     return E_NOTIMPL;
   CObjectVector<CUpdateItem> updateItems;
+  UINT codePage = (_forceCodePage ? _specifiedCodePage : _openCodePage);
+  
   for (UInt32 i = 0; i < numItems; i++)
   {
     CUpdateItem ui;
     Int32 newData;
     Int32 newProps;
-    UInt32 indexInArchive;
+    UInt32 indexInArc;
+    
     if (!callback)
       return E_FAIL;
-    RINOK(callback->GetUpdateItemInfo(i, &newData, &newProps, &indexInArchive));
+    
+    RINOK(callback->GetUpdateItemInfo(i, &newData, &newProps, &indexInArc));
+    
     ui.NewProps = IntToBool(newProps);
     ui.NewData = IntToBool(newData);
-    ui.IndexInArchive = indexInArchive;
+    ui.IndexInArc = indexInArc;
     ui.IndexInClient = i;
 
     if (IntToBool(newProps))
@@ -71,35 +114,35 @@ STDMETHODIMP CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numIt
         NCOM::CPropVariant prop;
         RINOK(callback->GetProperty(i, kpidPosixAttrib, &prop));
         if (prop.vt == VT_EMPTY)
-          ui.Mode = 0777 | (ui.IsDir ? 0040000 : 0100000);
+          ui.Mode =
+                MY_LIN_S_IRWXO
+              | MY_LIN_S_IRWXG
+              | MY_LIN_S_IRWXU
+              | (ui.IsDir ? MY_LIN_S_IFDIR : MY_LIN_S_IFREG);
         else if (prop.vt != VT_UI4)
           return E_INVALIDARG;
         else
           ui.Mode = prop.ulVal;
       }
+
       {
         NCOM::CPropVariant prop;
         RINOK(callback->GetProperty(i, kpidMTime, &prop));
         if (prop.vt == VT_EMPTY)
-          ui.Time = 0;
+          ui.MTime = 0;
         else if (prop.vt != VT_FILETIME)
           return E_INVALIDARG;
-        else if (!NTime::FileTimeToUnixTime(prop.filetime, ui.Time))
-          ui.Time = 0;
-      }
-      {
-        NCOM::CPropVariant prop;
-        RINOK(callback->GetProperty(i, kpidPath, &prop));
-        if (prop.vt == VT_BSTR)
-          ui.Name = UnicodeStringToMultiByte(NItemName::MakeLegalName(prop.bstrVal), CP_OEMCP);
-        else if (prop.vt != VT_EMPTY)
-          return E_INVALIDARG;
-        if (ui.IsDir)
-          ui.Name += '/';
+        else
+          ui.MTime = NTime::FileTimeToUnixTime64(prop.filetime);
       }
-      RINOK(GetPropString(callback, i, kpidUser, ui.User));
-      RINOK(GetPropString(callback, i, kpidGroup, ui.Group));
+      
+      RINOK(GetPropString(callback, i, kpidPath, ui.Name, codePage, true));
+      if (ui.IsDir && !ui.Name.IsEmpty() && ui.Name.Back() != '/')
+        ui.Name += '/';
+      RINOK(GetPropString(callback, i, kpidUser, ui.User, codePage));
+      RINOK(GetPropString(callback, i, kpidGroup, ui.Group, codePage));
     }
+
     if (IntToBool(newData))
     {
       NCOM::CPropVariant prop;
@@ -113,9 +156,18 @@ STDMETHODIMP CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numIt
         return E_INVALIDARG;
       */
     }
+    
     updateItems.Add(ui);
   }
-  return UpdateArchive(_stream, outStream, _items, updateItems, callback);
+  
+  if (_thereIsPaxExtendedHeader)
+  {
+    // we restore original order of files, if there is pax header block
+    updateItems.Sort(CompareUpdateItems, NULL);
+  }
+  
+  return UpdateArchive(_stream, outStream, _items, updateItems, codePage, callback);
+  
   COM_TRY_END
 }
 

data/ext/p7zip/CPP/7zip/Archive/Tar/TarHeader.cpp

@@ -1,4 +1,4 @@
-// Archive/Tar/Header.h
+// Archive/TarHeader.cpp
 
 #include "StdAfx.h"
 
@@ -8,18 +8,16 @@ namespace NArchive {
 namespace NTar {
 namespace NFileHeader {
 
-  // The checksum field is filled with this while the checksum is computed.
-  const char *kCheckSumBlanks = "        ";   // 8 blanks, no null
-
   const char *kLongLink = "././@LongLink";
   const char *kLongLink2 = "@LongLink";
 
   // The magic field is filled with this if uname and gname are valid.
   namespace NMagic
   {
-    const char *kUsTar  = "ustar"; // 5 chars
-    const char *kGNUTar = "GNUtar "; // 7 chars and a null
-    const char *kEmpty = "\0\0\0\0\0\0\0\0"; // 7 chars and a null
+    // const char *kUsTar  = "ustar";   // 5 chars
+    // const char *kGNUTar = "GNUtar "; // 7 chars and a null
+    // const char *kEmpty = "\0\0\0\0\0\0\0\0";
+    const char kUsTar_00[8] = { 'u', 's', 't', 'a', 'r', 0, '0', '0' } ;
   }
 
 }}}

data/ext/p7zip/CPP/7zip/Archive/Tar/TarHeader.h

@@ -1,20 +1,22 @@
-// Archive/Tar/Header.h
+// Archive/TarHeader.h
 
 #ifndef __ARCHIVE_TAR_HEADER_H
 #define __ARCHIVE_TAR_HEADER_H
 
-#include "Common/Types.h"
+#include "../../../Common/MyTypes.h"
 
 namespace NArchive {
 namespace NTar {
 
 namespace NFileHeader
 {
-  const int kRecordSize = 512;
-  const int kNameSize = 100;
-  const int kUserNameSize = 32;
-  const int kGroupNameSize = 32;
-  const int kPrefixSize = 155;
+  const unsigned kRecordSize = 512;
+  const unsigned kNameSize = 100;
+  const unsigned kUserNameSize = 32;
+  const unsigned kGroupNameSize = 32;
+  const unsigned kPrefixSize = 155;
+
+  const unsigned kUstarMagic_Offset = 257;
 
   /*
   struct CHeader
@@ -42,65 +44,39 @@ namespace NFileHeader
   };
   */
 
-  namespace NMode
-  {
-    const int kSetUID   = 04000;  // Set UID on execution
-    const int kSetGID   = 02000;  // Set GID on execution
-    const int kSaveText = 01000;  // Save text (sticky bit)
-  }
-
-  namespace NFilePermissions
-  {
-    const int kUserRead     = 00400;  // read by owner
-    const int kUserWrite    = 00200;  // write by owner
-    const int kUserExecute  = 00100;  // execute/search by owner
-    const int kGroupRead    = 00040;  // read by group
-    const int kGroupWrite   = 00020;  // write by group
-    const int kGroupExecute = 00010;  // execute/search by group
-    const int kOtherRead    = 00004;  // read by other
-    const int kOtherWrite   = 00002;  // write by other
-    const int kOtherExecute = 00001;  // execute/search by other
-  }
-
-
-  // The linkflag defines the type of file
   namespace NLinkFlag
   {
-    const char kOldNormal    = '\0'; // Normal disk file, Unix compatible
+    const char kOldNormal    = 0;   // Normal disk file, Unix compatible
     const char kNormal       = '0'; // Normal disk file
-    const char kLink         = '1'; // Link to previously dumped file
-    const char kSymbolicLink = '2'; // Symbolic link
+    const char kHardLink     = '1'; // Link to previously dumped file
+    const char kSymLink      = '2'; // Symbolic link
     const char kCharacter    = '3'; // Character special file
     const char kBlock        = '4'; // Block special file
     const char kDirectory    = '5'; // Directory
     const char kFIFO         = '6'; // FIFO special file
     const char kContiguous   = '7'; // Contiguous file
-
-    const char kDumpDir       = 'D'; /* GNUTYPE_DUMPDIR.
+    const char kGnu_LongLink = 'K';
+    const char kGnu_LongName = 'L';
+    const char kSparse       = 'S';
+    const char kDumpDir      = 'D'; /* GNUTYPE_DUMPDIR.
       data: list of files created by the --incremental (-G) option
       Each file name is preceded by either
         - 'Y' (file should be in this archive)
         - 'N' (file is a directory, or is not stored in the archive.)
         Each file name is terminated by a null + an additional null after
         the last file name. */
-
   }
-  // Further link types may be defined later.
-
-  // The checksum field is filled with this while the checksum is computed.
-  extern const char *kCheckSumBlanks;//   = "        ";   // 8 blanks, no null
 
   extern const char *kLongLink;  //   = "././@LongLink";
   extern const char *kLongLink2; //   = "@LongLink";
 
-  // The magic field is filled with this if uname and gname are valid.
   namespace NMagic
   {
-    extern const char *kUsTar; //   = "ustar"; // 5 chars
-    extern const char *kGNUTar; //  = "GNUtar "; // 7 chars and a null
-    extern const char *kEmpty; //  = "GNUtar "; // 7 chars and a null
+    // extern const char *kUsTar;  //  = "ustar"; // 5 chars
+    // extern const char *kGNUTar; //  = "GNUtar "; // 7 chars and a null
+    // extern const char *kEmpty;  //  = "\0\0\0\0\0\0\0\0"
+    extern const char kUsTar_00[];
   }
-
 }
 
 }}