react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/C/Util/7z/7z.dsp

@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /WX /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "UNICODE" /D "Z7_PPMD_SUPPORT" /D "Z7_EXTRACT_ONLY" /FAcs /Yu"Precomp.h" /FD /c
+# ADD CPP /nologo /MD /W4 /WX /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "UNICODE" /FAcs /Yu"Precomp.h" /FD /c
 # ADD BASE RSC /l 0x419 /d "NDEBUG"
 # ADD RSC /l 0x419 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W4 /WX /Gm /GX /ZI /Od /D "_DEBUG" /D "_SZ_ALLOC_DEBUG2" /D "_SZ_NO_INT_64_A" /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "UNICODE" /D "Z7_PPMD_SUPPORT" /D "Z7_EXTRACT_ONLY" /Yu"Precomp.h" /FD /GZ /c
+# ADD CPP /nologo /W4 /WX /Gm /GX /ZI /Od /D "_DEBUG" /D "_SZ_ALLOC_DEBUG2" /D "_SZ_NO_INT_64_A" /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /D "UNICODE" /Yu"Precomp.h" /FD /GZ /c
 # ADD BASE RSC /l 0x419 /d "_DEBUG"
 # ADD RSC /l 0x419 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -145,10 +145,6 @@ SOURCE=..\..\7zTypes.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\7zWindows.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Bcj2.c
 # End Source File
 # Begin Source File
@@ -234,10 +230,6 @@ SOURCE=.\Precomp.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Precomp.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\Precomp.h
 # End Source File
 # End Group

package/harmony/pushy/src/main/cpp/lzma/C/Util/7z/7zMain.c

@@ -1,41 +1,34 @@
 /* 7zMain.c - Test application for 7z Decoder
-2024-02-28 : Igor Pavlov : Public domain */
+2019-02-02 : Igor Pavlov : Public domain */
 
 #include "Precomp.h"
 
 #include <stdio.h>
 #include <string.h>
 
+#include "../../CpuArch.h"
+
+#include "../../7z.h"
+#include "../../7zAlloc.h"
+#include "../../7zBuf.h"
+#include "../../7zCrc.h"
+#include "../../7zFile.h"
+#include "../../7zVersion.h"
+
 #ifndef USE_WINDOWS_FILE
 /* for mkdir */
 #ifdef _WIN32
 #include <direct.h>
 #else
-#include <stdlib.h>
-#include <time.h>
-#ifdef __GNUC__
-#include <sys/time.h>
-#endif
-#include <fcntl.h>
-// #include <utime.h>
 #include <sys/stat.h>
 #include <errno.h>
 #endif
 #endif
 
-#include "../../7zFile.h"
-#include "../../7z.h"
-#include "../../7zAlloc.h"
-#include "../../7zBuf.h"
-#include "../../7zCrc.h"
-#include "../../7zVersion.h"
-
-#include "../../CpuArch.h"
 
 #define kInputBufSize ((size_t)1 << 18)
 
 static const ISzAlloc g_Alloc = { SzAlloc, SzFree };
-// static const ISzAlloc g_Alloc_temp = { SzAllocTemp, SzFreeTemp };
 
 
 static void Print(const char *s)
@@ -53,19 +46,19 @@ static int Buf_EnsureSize(CBuf *dest, size_t size)
 }
 
 #ifndef _WIN32
-#define MY_USE_UTF8
+#define _USE_UTF8
 #endif
 
-/* #define MY_USE_UTF8 */
+/* #define _USE_UTF8 */
 
-#ifdef MY_USE_UTF8
+#ifdef _USE_UTF8
 
-#define MY_UTF8_START(n) (0x100 - (1 << (7 - (n))))
+#define _UTF8_START(n) (0x100 - (1 << (7 - (n))))
 
-#define MY_UTF8_RANGE(n) (((UInt32)1) << ((n) * 5 + 6))
+#define _UTF8_RANGE(n) (((UInt32)1) << ((n) * 5 + 6))
 
-#define MY_UTF8_HEAD(n, val) ((Byte)(MY_UTF8_START(n) + (val >> (6 * (n)))))
-#define MY_UTF8_CHAR(n, val) ((Byte)(0x80 + (((val) >> (6 * (n))) & 0x3F)))
+#define _UTF8_HEAD(n, val) ((Byte)(_UTF8_START(n) + (val >> (6 * (n)))))
+#define _UTF8_CHAR(n, val) ((Byte)(0x80 + (((val) >> (6 * (n))) & 0x3F)))
 
 static size_t Utf16_To_Utf8_Calc(const UInt16 *src, const UInt16 *srcLim)
 {
@@ -82,7 +75,7 @@ static size_t Utf16_To_Utf8_Calc(const UInt16 *src, const UInt16 *srcLim)
     if (val < 0x80)
       continue;
 
-    if (val < MY_UTF8_RANGE(1))
+    if (val < _UTF8_RANGE(1))
     {
       size++;
       continue;
@@ -90,7 +83,7 @@ static size_t Utf16_To_Utf8_Calc(const UInt16 *src, const UInt16 *srcLim)
 
     if (val >= 0xD800 && val < 0xDC00 && src != srcLim)
     {
-      const UInt32 c2 = *src;
+      UInt32 c2 = *src;
       if (c2 >= 0xDC00 && c2 < 0xE000)
       {
         src++;
@@ -115,37 +108,37 @@ static Byte *Utf16_To_Utf8(Byte *dest, const UInt16 *src, const UInt16 *srcLim)
     
     if (val < 0x80)
     {
-      *dest++ = (Byte)val;
+      *dest++ = (char)val;
       continue;
     }
 
-    if (val < MY_UTF8_RANGE(1))
+    if (val < _UTF8_RANGE(1))
     {
-      dest[0] = MY_UTF8_HEAD(1, val);
-      dest[1] = MY_UTF8_CHAR(0, val);
+      dest[0] = _UTF8_HEAD(1, val);
+      dest[1] = _UTF8_CHAR(0, val);
       dest += 2;
       continue;
     }
 
     if (val >= 0xD800 && val < 0xDC00 && src != srcLim)
     {
-      const UInt32 c2 = *src;
+      UInt32 c2 = *src;
       if (c2 >= 0xDC00 && c2 < 0xE000)
       {
         src++;
         val = (((val - 0xD800) << 10) | (c2 - 0xDC00)) + 0x10000;
-        dest[0] = MY_UTF8_HEAD(3, val);
-        dest[1] = MY_UTF8_CHAR(2, val);
-        dest[2] = MY_UTF8_CHAR(1, val);
-        dest[3] = MY_UTF8_CHAR(0, val);
+        dest[0] = _UTF8_HEAD(3, val);
+        dest[1] = _UTF8_CHAR(2, val);
+        dest[2] = _UTF8_CHAR(1, val);
+        dest[3] = _UTF8_CHAR(0, val);
         dest += 4;
         continue;
       }
     }
     
-    dest[0] = MY_UTF8_HEAD(2, val);
-    dest[1] = MY_UTF8_CHAR(1, val);
-    dest[2] = MY_UTF8_CHAR(0, val);
+    dest[0] = _UTF8_HEAD(2, val);
+    dest[1] = _UTF8_CHAR(1, val);
+    dest[2] = _UTF8_CHAR(0, val);
     dest += 3;
   }
 }
@@ -163,27 +156,27 @@ static SRes Utf16_To_Utf8Buf(CBuf *dest, const UInt16 *src, size_t srcLen)
 #endif
 
 static SRes Utf16_To_Char(CBuf *buf, const UInt16 *s
-    #ifndef MY_USE_UTF8
+    #ifndef _USE_UTF8
     , UINT codePage
     #endif
     )
 {
-  size_t len = 0;
-  for (len = 0; s[len] != 0; len++) {}
+  unsigned len = 0;
+  for (len = 0; s[len] != 0; len++);
 
-  #ifndef MY_USE_UTF8
+  #ifndef _USE_UTF8
   {
-    const size_t size = len * 3 + 100;
+    unsigned size = len * 3 + 100;
     if (!Buf_EnsureSize(buf, size))
       return SZ_ERROR_MEM;
     {
       buf->data[0] = 0;
       if (len != 0)
       {
-        const char defaultChar = '_';
+        char defaultChar = '_';
         BOOL defUsed;
-        const unsigned numChars = (unsigned)WideCharToMultiByte(
-            codePage, 0, (LPCWSTR)s, (int)len, (char *)buf->data, (int)size, &defaultChar, &defUsed);
+        unsigned numChars = 0;
+        numChars = WideCharToMultiByte(codePage, 0, (LPCWSTR)s, len, (char *)buf->data, size, &defaultChar, &defUsed);
         if (numChars == 0 || numChars >= size)
           return SZ_ERROR_FAIL;
         buf->data[numChars] = 0;
@@ -199,8 +192,8 @@ static SRes Utf16_To_Char(CBuf *buf, const UInt16 *s
 #ifdef _WIN32
   #ifndef USE_WINDOWS_FILE
     static UINT g_FileCodePage = CP_ACP;
-    #define MY_FILE_CODE_PAGE_PARAM ,g_FileCodePage
   #endif
+  #define MY_FILE_CODE_PAGE_PARAM ,g_FileCodePage
 #else
   #define MY_FILE_CODE_PAGE_PARAM
 #endif
@@ -216,7 +209,7 @@ static WRes MyCreateDir(const UInt16 *name)
   CBuf buf;
   WRes res;
   Buf_Init(&buf);
-  RINOK(Utf16_To_Char(&buf, name MY_FILE_CODE_PAGE_PARAM))
+  RINOK(Utf16_To_Char(&buf, name MY_FILE_CODE_PAGE_PARAM));
 
   res =
   #ifdef _WIN32
@@ -239,7 +232,7 @@ static WRes OutFile_OpenUtf16(CSzFile *p, const UInt16 *name)
   CBuf buf;
   WRes res;
   Buf_Init(&buf);
-  RINOK(Utf16_To_Char(&buf, name MY_FILE_CODE_PAGE_PARAM))
+  RINOK(Utf16_To_Char(&buf, name MY_FILE_CODE_PAGE_PARAM));
   res = OutFile_Open(p, (const char *)buf.data);
   Buf_Free(&buf, &g_Alloc);
   return res;
@@ -253,7 +246,7 @@ static SRes PrintString(const UInt16 *s)
   SRes res;
   Buf_Init(&buf);
   res = Utf16_To_Char(&buf, s
-      #ifndef MY_USE_UTF8
+      #ifndef _USE_UTF8
       , CP_OEMCP
       #endif
       );
@@ -307,143 +300,17 @@ static void UIntToStr_2(char *s, unsigned value)
   s[1] = (char)('0' + (value % 10));
 }
 
-
 #define PERIOD_4 (4 * 365 + 1)
 #define PERIOD_100 (PERIOD_4 * 25 - 1)
 #define PERIOD_400 (PERIOD_100 * 4 + 1)
 
-
-
-#ifndef _WIN32
-
-// MS uses long for BOOL, but long is 32-bit in MS. So we use int.
-// typedef long BOOL;
-typedef int BOOL;
-
-typedef struct
-{
-  DWORD dwLowDateTime;
-  DWORD dwHighDateTime;
-} FILETIME;
-
-static LONG TIME_GetBias(void)
-{
-  const time_t utc = time(NULL);
-  struct tm *ptm = localtime(&utc);
-  const int localdaylight = ptm->tm_isdst; /* daylight for local timezone */
-  ptm = gmtime(&utc);
-  ptm->tm_isdst = localdaylight; /* use local daylight, not that of Greenwich */
-  return (int)(mktime(ptm) - utc);
-}
-
-#define TICKS_PER_SEC 10000000
-
-#define GET_TIME_64(pft) ((pft)->dwLowDateTime | ((UInt64)(pft)->dwHighDateTime << 32))
-
-#define SET_FILETIME(ft, v64) \
-   (ft)->dwLowDateTime = (DWORD)v64; \
-   (ft)->dwHighDateTime = (DWORD)(v64 >> 32);
-
-#define WINAPI
-#define TRUE 1
-
-static BOOL WINAPI FileTimeToLocalFileTime(const FILETIME *fileTime, FILETIME *localFileTime)
-{
-  UInt64 v = GET_TIME_64(fileTime);
-  v = (UInt64)((Int64)v - (Int64)TIME_GetBias() * TICKS_PER_SEC);
-  SET_FILETIME(localFileTime, v)
-  return TRUE;
-}
-
-static const UInt32 kNumTimeQuantumsInSecond = 10000000;
-static const UInt32 kFileTimeStartYear = 1601;
-static const UInt32 kUnixTimeStartYear = 1970;
-
-static Int64 Time_FileTimeToUnixTime64(const FILETIME *ft)
-{
-  const UInt64 kUnixTimeOffset =
-      (UInt64)60 * 60 * 24 * (89 + 365 * (kUnixTimeStartYear - kFileTimeStartYear));
-  const UInt64 winTime = GET_TIME_64(ft);
-  return (Int64)(winTime / kNumTimeQuantumsInSecond) - (Int64)kUnixTimeOffset;
-}
-
-#if defined(_AIX)
-  #define MY_ST_TIMESPEC st_timespec
-#else
-  #define MY_ST_TIMESPEC timespec
-#endif
-
-static void FILETIME_To_timespec(const FILETIME *ft, struct MY_ST_TIMESPEC *ts)
-{
-  if (ft)
-  {
-    const Int64 sec = Time_FileTimeToUnixTime64(ft);
-    // time_t is long
-    const time_t sec2 = (time_t)sec;
-    if (sec2 == sec)
-    {
-      ts->tv_sec = sec2;
-      {
-        const UInt64 winTime = GET_TIME_64(ft);
-        ts->tv_nsec = (long)((winTime % 10000000) * 100);
-      }
-      return;
-    }
-  }
-  // else
-  {
-    ts->tv_sec = 0;
-    // ts.tv_nsec = UTIME_NOW; // set to the current time
-    ts->tv_nsec = UTIME_OMIT; // keep old timesptamp
-  }
-}
-
-static WRes Set_File_FILETIME(const UInt16 *name, const FILETIME *mTime)
-{
-  struct timespec times[2];
-  
-  const int flags = 0; // follow link
-    // = AT_SYMLINK_NOFOLLOW; // don't follow link
-
-  CBuf buf;
-  int res;
-  Buf_Init(&buf);
-  RINOK(Utf16_To_Char(&buf, name MY_FILE_CODE_PAGE_PARAM))
-  FILETIME_To_timespec(NULL, &times[0]);
-  FILETIME_To_timespec(mTime, &times[1]);
-  res = utimensat(AT_FDCWD, (const char *)buf.data, times, flags);
-  Buf_Free(&buf, &g_Alloc);
-  if (res == 0)
-    return 0;
-  return errno;
-}
-
-#endif
-
-static void NtfsFileTime_to_FILETIME(const CNtfsFileTime *t, FILETIME *ft)
-{
-  ft->dwLowDateTime = (DWORD)(t->Low);
-  ft->dwHighDateTime = (DWORD)(t->High);
-}
-
-static void ConvertFileTimeToString(const CNtfsFileTime *nTime, char *s)
+static void ConvertFileTimeToString(const CNtfsFileTime *nt, char *s)
 {
   unsigned year, mon, hour, min, sec;
   Byte ms[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
-  UInt32 t;
+  unsigned t;
   UInt32 v;
-  // UInt64 v64 = nt->Low | ((UInt64)nt->High << 32);
-  UInt64 v64;
-  {
-    FILETIME fileTime, locTime;
-    NtfsFileTime_to_FILETIME(nTime, &fileTime);
-    if (!FileTimeToLocalFileTime(&fileTime, &locTime))
-    {
-      locTime.dwHighDateTime =
-      locTime.dwLowDateTime = 0;
-    }
-    v64 = locTime.dwLowDateTime | ((UInt64)locTime.dwHighDateTime << 32);
-  }
+  UInt64 v64 = nt->Low | ((UInt64)nt->High << 32);
   v64 /= 10000000;
   sec = (unsigned)(v64 % 60); v64 /= 60;
   min = (unsigned)(v64 % 60); v64 /= 60;
@@ -462,7 +329,7 @@ static void ConvertFileTimeToString(const CNtfsFileTime *nTime, char *s)
     ms[1] = 29;
   for (mon = 0;; mon++)
   {
-    const UInt32 d = ms[mon];
+    unsigned d = ms[mon];
     if (v < d)
       break;
     v -= d;
@@ -475,7 +342,7 @@ static void ConvertFileTimeToString(const CNtfsFileTime *nTime, char *s)
   UIntToStr_2(s, sec); s[2] = 0;
 }
 
-static void PrintLF(void)
+static void PrintLF()
 {
   Print("\n");
 }
@@ -487,43 +354,6 @@ static void PrintError(char *s)
   PrintLF();
 }
 
-static void PrintError_WRes(const char *message, WRes wres)
-{
-  Print("\nERROR: ");
-  Print(message);
-  PrintLF();
-  {
-    char s[32];
-    UIntToStr(s, (unsigned)wres, 1);
-    Print("System error code: ");
-    Print(s);
-  }
-  // sprintf(buffer + strlen(buffer), "\nSystem error code: %d", (unsigned)wres);
-  #ifdef _WIN32
-  {
-    char *s = NULL;
-    if (FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-        FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-        NULL, wres, 0, (LPSTR) &s, 0, NULL) != 0 && s)
-    {
-      Print(" : ");
-      Print(s);
-      LocalFree(s);
-    }
-  }
-  #else
-  {
-    const char *s = strerror(wres);
-    if (s)
-    {
-      Print(" : ");
-      Print(s);
-    }
-  }
-  #endif
-  PrintLF();
-}
-
 static void GetAttribString(UInt32 wa, BoolInt isDir, char *s)
 {
   #ifdef USE_WINDOWS_FILE
@@ -542,7 +372,7 @@ static void GetAttribString(UInt32 wa, BoolInt isDir, char *s)
 
 // #define NUM_PARENTS_MAX 128
 
-int Z7_CDECL main(int numargs, char *args[])
+int MY_CDECL main(int numargs, char *args[])
 {
   ISzAlloc allocImp;
   ISzAlloc allocTempImp;
@@ -582,24 +412,18 @@ int Z7_CDECL main(int numargs, char *args[])
 
   allocImp = g_Alloc;
   allocTempImp = g_Alloc;
-  // allocTempImp = g_Alloc_temp;
 
+  #ifdef UNDER_CE
+  if (InFile_OpenW(&archiveStream.file, L"\test.7z"))
+  #else
+  if (InFile_Open(&archiveStream.file, args[2]))
+  #endif
   {
-    WRes wres =
-    #ifdef UNDER_CE
-      InFile_OpenW(&archiveStream.file, L"\test.7z"); // change it
-    #else
-      InFile_Open(&archiveStream.file, args[2]);
-    #endif
-    if (wres != 0)
-    {
-      PrintError_WRes("cannot open input file", wres);
-      return 1;
-    }
+    PrintError("can not open input file");
+    return 1;
   }
 
   FileInStream_CreateVTable(&archiveStream);
-  archiveStream.wres = 0;
   LookToRead2_CreateVTable(&lookStream, False);
   lookStream.buf = NULL;
 
@@ -613,7 +437,7 @@ int Z7_CDECL main(int numargs, char *args[])
     {
       lookStream.bufSize = kInputBufSize;
       lookStream.realStream = &archiveStream.vt;
-      LookToRead2_INIT(&lookStream)
+      LookToRead2_Init(&lookStream);
     }
   }
     
@@ -659,7 +483,7 @@ int Z7_CDECL main(int numargs, char *args[])
         size_t outSizeProcessed = 0;
         // const CSzFileItem *f = db.Files + i;
         size_t len;
-        const BoolInt isDir = SzArEx_IsDir(&db, i);
+        unsigned isDir = SzArEx_IsDir(&db, i);
         if (listCommand == 0 && isDir && !fullPaths)
           continue;
         len = SzArEx_GetFileNameUtf16(&db, i, NULL);
@@ -722,8 +546,8 @@ int Z7_CDECL main(int numargs, char *args[])
         }
 
         Print(testCommand ?
-            "T ":
-            "- ");
+            "Testing    ":
+            "Extracting ");
         res = PrintString(temp);
         if (res != SZ_OK)
           break;
@@ -767,37 +591,27 @@ int Z7_CDECL main(int numargs, char *args[])
             PrintLF();
             continue;
           }
-          else
+          else if (OutFile_OpenUtf16(&outFile, destPath))
           {
-            const WRes wres = OutFile_OpenUtf16(&outFile, destPath);
-            if (wres != 0)
-            {
-              PrintError_WRes("cannot open output file", wres);
-              res = SZ_ERROR_FAIL;
-              break;
-            }
+            PrintError("can not open output file");
+            res = SZ_ERROR_FAIL;
+            break;
           }
 
           processedSize = outSizeProcessed;
           
+          if (File_Write(&outFile, outBuffer + offset, &processedSize) != 0 || processedSize != outSizeProcessed)
           {
-            const WRes wres = File_Write(&outFile, outBuffer + offset, &processedSize);
-            if (wres != 0 || processedSize != outSizeProcessed)
-            {
-              PrintError_WRes("cannot write output file", wres);
-              res = SZ_ERROR_FAIL;
-              break;
-            }
+            PrintError("can not write output file");
+            res = SZ_ERROR_FAIL;
+            break;
           }
 
+          #ifdef USE_WINDOWS_FILE
           {
-            FILETIME mtime;
+            FILETIME mtime, ctime;
             FILETIME *mtimePtr = NULL;
-            
-            #ifdef USE_WINDOWS_FILE
-            FILETIME ctime;
             FILETIME *ctimePtr = NULL;
-            #endif
 
             if (SzBitWithVals_Check(&db.MTime, i))
             {
@@ -806,8 +620,6 @@ int Z7_CDECL main(int numargs, char *args[])
               mtime.dwHighDateTime = (DWORD)(t->High);
               mtimePtr = &mtime;
             }
-
-            #ifdef USE_WINDOWS_FILE
             if (SzBitWithVals_Check(&db.CTime, i))
             {
               const CNtfsFileTime *t = &db.CTime.Vals[i];
@@ -815,29 +627,16 @@ int Z7_CDECL main(int numargs, char *args[])
               ctime.dwHighDateTime = (DWORD)(t->High);
               ctimePtr = &ctime;
             }
-
             if (mtimePtr || ctimePtr)
               SetFileTime(outFile.handle, ctimePtr, NULL, mtimePtr);
-            #endif
+          }
+          #endif
           
-            {
-              const WRes wres = File_Close(&outFile);
-              if (wres != 0)
-              {
-                PrintError_WRes("cannot close output file", wres);
-                res = SZ_ERROR_FAIL;
-                break;
-              }
-            }
-
-            #ifndef USE_WINDOWS_FILE
-            #ifdef _WIN32
-            mtimePtr = mtimePtr;
-            #else
-            if (mtimePtr)
-              Set_File_FILETIME(destPath, mtimePtr);
-            #endif
-            #endif
+          if (File_Close(&outFile))
+          {
+            PrintError("can not close output file");
+            res = SZ_ERROR_FAIL;
+            break;
           }
           
           #ifdef USE_WINDOWS_FILE
@@ -873,15 +672,13 @@ int Z7_CDECL main(int numargs, char *args[])
   if (res == SZ_ERROR_UNSUPPORTED)
     PrintError("decoder doesn't support this archive");
   else if (res == SZ_ERROR_MEM)
-    PrintError("cannot allocate memory");
+    PrintError("can not allocate memory");
   else if (res == SZ_ERROR_CRC)
     PrintError("CRC error");
-  else if (res == SZ_ERROR_READ /* || archiveStream.Res != 0 */)
-    PrintError_WRes("Read Error", archiveStream.wres);
   else
   {
     char s[32];
-    UInt64ToStr((unsigned)res, s, 0);
+    UInt64ToStr(res, s, 0);
     PrintError(s);
   }
   

package/harmony/pushy/src/main/cpp/lzma/C/Util/7z/Precomp.h

@@ -1,13 +1,10 @@
-/* Precomp.h -- Precomp
-2024-01-23 : Igor Pavlov : Public domain */
+/* Precomp.h -- StdAfx
+2013-06-16 : Igor Pavlov : Public domain */
 
-// #ifndef ZIP7_INC_PRECOMP_LOC_H
-// #define ZIP7_INC_PRECOMP_LOC_H
+#ifndef __7Z_PRECOMP_H
+#define __7Z_PRECOMP_H
 
-#if defined(_MSC_VER) && _MSC_VER >= 1800
-#pragma warning(disable : 4464) // relative include path contains '..'
-#endif
-
-#include "../../Precomp.h"
+#include "../../Compiler.h"
+#include "../../7zTypes.h"
 
-// #endif
+#endif

package/harmony/pushy/src/main/cpp/lzma/C/Util/7z/makefile

@@ -1,10 +1,12 @@
-CFLAGS = $(CFLAGS) -DZ7_PPMD_SUPPORT -DZ7_EXTRACT_ONLY
+CFLAGS = $(CFLAGS) -D_7ZIP_PPMD_SUPPPORT
 
 PROG = 7zDec.exe
 
 C_OBJS = \
   $O\7zAlloc.obj \
   $O\7zBuf.obj \
+  $O\7zCrc.obj \
+  $O\7zCrcOpt.obj \
   $O\7zFile.obj \
   $O\7zDec.obj \
   $O\7zArcIn.obj \
@@ -23,14 +25,10 @@ C_OBJS = \
 7Z_OBJS = \
   $O\7zMain.obj \
 
-!include "../../../CPP/7zip/Crc.mak"
-!include "../../../CPP/7zip/LzmaDec.mak"
-
 OBJS = \
   $O\Precomp.obj \
   $(7Z_OBJS) \
   $(C_OBJS) \
-  $(ASM_OBJS) \
 
 !include "../../../CPP/Build.mak"
 
@@ -40,5 +38,3 @@ $(C_OBJS): ../../$(*B).c
 	$(CCOMPL_USE)
 $O\Precomp.obj: Precomp.c
 	$(CCOMPL_PCH)
-
-!include "../../Asm_c.mak"