3 files changed, 116 insertions, 59 deletions

diff --git a/C/Util/Lzma/LzmaUtil.c b/C/Util/Lzma/LzmaUtil.c
index 62a5907..b9b974b 100644
--- a/C/Util/Lzma/LzmaUtil.c
+++ b/C/Util/Lzma/LzmaUtil.c
@@ -1,7 +1,7 @@
 /* LzmaUtil.c -- Test application for LZMA compression
-2021-11-01 : Igor Pavlov : Public domain */
+2023-03-07 : Igor Pavlov : Public domain */
 
-#include "../../Precomp.h"
+#include "Precomp.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -21,48 +21,80 @@ static const char * const kCantWriteMessage = "Cannot write output file";
 static const char * const kCantAllocateMessage = "Cannot allocate memory";
 static const char * const kDataErrorMessage = "Data error";
 
-static void PrintHelp(char *buffer)
+static void Print(const char *s)
 {
-  strcat(buffer,
-    "\nLZMA-C " MY_VERSION_CPU " : " MY_COPYRIGHT_DATE "\n\n"
-    "Usage:  lzma <e|d> inputFile outputFile\n"
-    "  e: encode file\n"
-    "  d: decode file\n");
+  fputs(s, stdout);
 }
 
-static int PrintError(char *buffer, const char *message)
+static void PrintHelp(void)
 {
-  strcat(buffer, "\nError: ");
-  strcat(buffer, message);
-  strcat(buffer, "\n");
+  Print(
+    "\n" "LZMA-C " MY_VERSION_CPU " : " MY_COPYRIGHT_DATE
+    "\n"
+    "\n" "Usage:  lzma <e|d> inputFile outputFile"
+    "\n" "  e: encode file"
+    "\n" "  d: decode file"
+    "\n");
+}
+
+static int PrintError(const char *message)
+{
+  Print("\nError: ");
+  Print(message);
+  Print("\n");
   return 1;
 }
 
-static int PrintError_WRes(char *buffer, const char *message, WRes wres)
+#define CONVERT_INT_TO_STR(charType, tempSize) \
+  unsigned char temp[tempSize]; unsigned i = 0; \
+  while (val >= 10) { temp[i++] = (unsigned char)('0' + (unsigned)(val % 10)); val /= 10; } \
+  *s++ = (charType)('0' + (unsigned)val); \
+  while (i != 0) { i--; *s++ = (charType)temp[i]; } \
+  *s = 0; \
+  return s;
+
+static char * Convert_unsigned_To_str(unsigned val, char *s)
 {
-  strcat(buffer, "\nError: ");
-  strcat(buffer, message);
-  sprintf(buffer + strlen(buffer), "\nSystem error code: %d", (unsigned)wres);
+  CONVERT_INT_TO_STR(char, 32)
+}
+
+static void Print_unsigned(unsigned code)
+{
+  char str[32];
+  Convert_unsigned_To_str(code, str);
+  Print(str);
+}
+
+static int PrintError_WRes(const char *message, WRes wres)
+{
+  PrintError(message);
+  Print("\nSystem error code: ");
+  Print_unsigned((unsigned)wres);
   #ifndef _WIN32
   {
     const char *s = strerror(wres);
     if (s)
-      sprintf(buffer + strlen(buffer), " : %s", s);
+    {
+      Print(" : ");
+      Print(s);
+    }
   }
   #endif
-  strcat(buffer, "\n");
+  Print("\n");
   return 1;
 }
 
-static int PrintErrorNumber(char *buffer, SRes val)
+static int PrintErrorNumber(SRes val)
 {
-  sprintf(buffer + strlen(buffer), "\n7-Zip error code: %d\n", (unsigned)val);
+  Print("\n7-Zip error code: ");
+  Print_unsigned((unsigned)val);
+  Print("\n");
   return 1;
 }
 
-static int PrintUserError(char *buffer)
+static int PrintUserError(void)
 {
-  return PrintError(buffer, "Incorrect command");
+  return PrintError("Incorrect command");
 }
 
 
@@ -70,10 +102,10 @@ static int PrintUserError(char *buffer)
 #define OUT_BUF_SIZE (1 << 16)
 
 
-static SRes Decode2(CLzmaDec *state, ISeqOutStream *outStream, ISeqInStream *inStream,
+static SRes Decode2(CLzmaDec *state, ISeqOutStreamPtr outStream, ISeqInStreamPtr inStream,
     UInt64 unpackSize)
 {
-  int thereIsSize = (unpackSize != (UInt64)(Int64)-1);
+  const int thereIsSize = (unpackSize != (UInt64)(Int64)-1);
   Byte inBuf[IN_BUF_SIZE];
   Byte outBuf[OUT_BUF_SIZE];
   size_t inPos = 0, inSize = 0, outPos = 0;
@@ -83,7 +115,7 @@ static SRes Decode2(CLzmaDec *state, ISeqOutStream *outStream, ISeqInStream *inS
     if (inPos == inSize)
     {
       inSize = IN_BUF_SIZE;
-      RINOK(inStream->Read(inStream, inBuf, &inSize));
+      RINOK(inStream->Read(inStream, inBuf, &inSize))
       inPos = 0;
     }
     {
@@ -124,7 +156,7 @@ static SRes Decode2(CLzmaDec *state, ISeqOutStream *outStream, ISeqInStream *inS
 }
 
 
-static SRes Decode(ISeqOutStream *outStream, ISeqInStream *inStream)
+static SRes Decode(ISeqOutStreamPtr outStream, ISeqInStreamPtr inStream)
 {
   UInt64 unpackSize;
   int i;
@@ -137,27 +169,29 @@ static SRes Decode(ISeqOutStream *outStream, ISeqInStream *inStream)
 
   /* Read and parse header */
 
-  RINOK(SeqInStream_Read(inStream, header, sizeof(header)));
-
+  {
+    size_t size = sizeof(header);
+    RINOK(SeqInStream_ReadMax(inStream, header, &size))
+    if (size != sizeof(header))
+      return SZ_ERROR_INPUT_EOF;
+  }
   unpackSize = 0;
   for (i = 0; i < 8; i++)
     unpackSize += (UInt64)header[LZMA_PROPS_SIZE + i] << (i * 8);
 
-  LzmaDec_Construct(&state);
-  RINOK(LzmaDec_Allocate(&state, header, LZMA_PROPS_SIZE, &g_Alloc));
+  LzmaDec_CONSTRUCT(&state)
+  RINOK(LzmaDec_Allocate(&state, header, LZMA_PROPS_SIZE, &g_Alloc))
   res = Decode2(&state, outStream, inStream, unpackSize);
   LzmaDec_Free(&state, &g_Alloc);
   return res;
 }
 
-static SRes Encode(ISeqOutStream *outStream, ISeqInStream *inStream, UInt64 fileSize, char *rs)
+static SRes Encode(ISeqOutStreamPtr outStream, ISeqInStreamPtr inStream, UInt64 fileSize)
 {
   CLzmaEncHandle enc;
   SRes res;
   CLzmaEncProps props;
 
-  UNUSED_VAR(rs);
-
   enc = LzmaEnc_Create(&g_Alloc);
   if (enc == 0)
     return SZ_ERROR_MEM;
@@ -187,7 +221,7 @@ static SRes Encode(ISeqOutStream *outStream, ISeqInStream *inStream, UInt64 file
 }
 
 
-static int main2(int numArgs, const char *args[], char *rs)
+int Z7_CDECL main(int numArgs, const char *args[])
 {
   CFileSeqInStream inStream;
   CFileOutStream outStream;
@@ -208,29 +242,31 @@ static int main2(int numArgs, const char *args[], char *rs)
 
   if (numArgs == 1)
   {
-    PrintHelp(rs);
+    PrintHelp();
     return 0;
   }
 
   if (numArgs < 3 || numArgs > 4 || strlen(args[1]) != 1)
-    return PrintUserError(rs);
+    return PrintUserError();
 
   c = args[1][0];
   encodeMode = (c == 'e' || c == 'E');
   if (!encodeMode && c != 'd' && c != 'D')
-    return PrintUserError(rs);
+    return PrintUserError();
 
+  /*
   {
     size_t t4 = sizeof(UInt32);
     size_t t8 = sizeof(UInt64);
     if (t4 != 4 || t8 != 8)
-      return PrintError(rs, "Incorrect UInt32 or UInt64");
+      return PrintError("Incorrect UInt32 or UInt64");
   }
+  */
 
   {
-    WRes wres = InFile_Open(&inStream.file, args[2]);
+    const WRes wres = InFile_Open(&inStream.file, args[2]);
     if (wres != 0)
-      return PrintError_WRes(rs, "Cannot open input file", wres);
+      return PrintError_WRes("Cannot open input file", wres);
   }
 
   if (numArgs > 3)
@@ -239,18 +275,18 @@ static int main2(int numArgs, const char *args[], char *rs)
     useOutFile = True;
     wres = OutFile_Open(&outStream.file, args[3]);
     if (wres != 0)
-      return PrintError_WRes(rs, "Cannot open output file", wres);
+      return PrintError_WRes("Cannot open output file", wres);
   }
   else if (encodeMode)
-    PrintUserError(rs);
+    PrintUserError();
 
   if (encodeMode)
   {
     UInt64 fileSize;
-    WRes wres = File_GetLength(&inStream.file, &fileSize);
+    const WRes wres = File_GetLength(&inStream.file, &fileSize);
     if (wres != 0)
-      return PrintError_WRes(rs, "Cannot get file length", wres);
-    res = Encode(&outStream.vt, &inStream.vt, fileSize, rs);
+      return PrintError_WRes("Cannot get file length", wres);
+    res = Encode(&outStream.vt, &inStream.vt, fileSize);
   }
   else
   {
@@ -264,23 +300,14 @@ static int main2(int numArgs, const char *args[], char *rs)
   if (res != SZ_OK)
   {
     if (res == SZ_ERROR_MEM)
-      return PrintError(rs, kCantAllocateMessage);
+      return PrintError(kCantAllocateMessage);
     else if (res == SZ_ERROR_DATA)
-      return PrintError(rs, kDataErrorMessage);
+      return PrintError(kDataErrorMessage);
     else if (res == SZ_ERROR_WRITE)
-      return PrintError_WRes(rs, kCantWriteMessage, outStream.wres);
+      return PrintError_WRes(kCantWriteMessage, outStream.wres);
     else if (res == SZ_ERROR_READ)
-      return PrintError_WRes(rs, kCantReadMessage, inStream.wres);
-    return PrintErrorNumber(rs, res);
+      return PrintError_WRes(kCantReadMessage, inStream.wres);
+    return PrintErrorNumber(res);
   }
   return 0;
 }
-
-
-int MY_CDECL main(int numArgs, const char *args[])
-{
-  char rs[1000] = { 0 };
-  int res = main2(numArgs, args, rs);
-  fputs(rs, stdout);
-  return res;
-}
diff --git a/C/Util/Lzma/LzmaUtil.dsp b/C/Util/Lzma/LzmaUtil.dsp
index 4e38e4a..e2e7d42 100644
--- a/C/Util/Lzma/LzmaUtil.dsp
+++ b/C/Util/Lzma/LzmaUtil.dsp
@@ -106,6 +106,10 @@ SOURCE=..\..\7zVersion.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\7zWindows.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Alloc.c
 # End Source File
 # Begin Source File
@@ -114,6 +118,10 @@ SOURCE=..\..\Alloc.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Compiler.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\CpuArch.h
 # End Source File
 # Begin Source File
@@ -162,6 +170,14 @@ SOURCE=.\LzmaUtil.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Precomp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Precomp.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Threads.c
 # End Source File
 # Begin Source File
diff --git a/C/Util/Lzma/Precomp.h b/C/Util/Lzma/Precomp.h
new file mode 100644
index 0000000..bc8fa21
--- /dev/null
+++ b/C/Util/Lzma/Precomp.h
@@ -0,0 +1,14 @@
+/* Precomp.h -- StdAfx
+2023-03-04 : Igor Pavlov : Public domain */
+
+#ifndef ZIP7_INC_PRECOMP_H
+#define ZIP7_INC_PRECOMP_H
+
+#if defined(_MSC_VER) && _MSC_VER >= 1800
+#pragma warning(disable : 4464) // relative include path contains '..'
+#endif
+
+#include "../../Compiler.h"
+#include "../../7zTypes.h"
+
+#endif