1 files changed, 26 insertions, 14 deletions
diff --git a/src/libs/7zip/win/CPP/7zip/UI/Console/PercentPrinter.cpp b/src/libs/7zip/win/CPP/7zip/UI/Console/PercentPrinter.cpp
index 28452b177..f2889957a 100644
--- a/src/libs/7zip/win/CPP/7zip/UI/Console/PercentPrinter.cpp
+++ b/src/libs/7zip/win/CPP/7zip/UI/Console/PercentPrinter.cpp
@@ -2,18 +2,18 @@
 
 #include "StdAfx.h"
 
-#include "Common/IntToString.h"
-#include "Common/MyString.h"
+#include "../../../Common/Defs.h"
+#include "../../../Common/IntToString.h"
 
 #include "PercentPrinter.h"
 
-const int kPaddingSize = 2;
-const int kPercentsSize = 4;
-const int kMaxExtraSize = kPaddingSize + 32 + kPercentsSize;
+static const unsigned kPaddingSize = 2;
+static const unsigned kPercentsSize = 4;
+static const unsigned kMaxExtraSize = kPaddingSize + 32 + kPercentsSize;
 
-static void ClearPrev(char *p, int num)
+static void ClearPrev(char *p, unsigned num)
 {
-  int i;
+  unsigned i;
   for (i = 0; i < num; i++) *p++ = '\b';
   for (i = 0; i < num; i++) *p++ = ' ';
   for (i = 0; i < num; i++) *p++ = '\b';
@@ -51,18 +51,30 @@ void CPercentPrinter::PrintNewLine()
 void CPercentPrinter::RePrintRatio()
 {
   char s[32];
-  ConvertUInt64ToString(((m_Total == 0) ? 0 : (m_CurValue * 100 / m_Total)), s);
-  int size = (int)strlen(s);
-  s[size++] = '%';
-  s[size] = '\0';
+  unsigned size;
+  {
+    char c = '%';
+    UInt64 value = 0;
+    if (m_Total == (UInt64)(Int64)-1)
+    {
+      value = m_CurValue >> 20;
+      c = 'M';
+    }
+    else if (m_Total != 0)
+      value = m_CurValue * 100 / m_Total;
+    ConvertUInt64ToString(value, s);
+    size = (unsigned)strlen(s);
+    s[size++] = c;
+    s[size] = '\0';
+  }
 
-  int extraSize = kPaddingSize + MyMax(size, kPercentsSize);
+  unsigned extraSize = kPaddingSize + MyMax(size, kPercentsSize);
   if (extraSize < m_NumExtraChars)
     extraSize = m_NumExtraChars;
 
   char fullString[kMaxExtraSize * 3];
   char *p = fullString;
-  int i;
+  unsigned i;
   if (m_NumExtraChars == 0)
   {
     for (i = 0; i < extraSize; i++)
@@ -73,7 +85,7 @@ void CPercentPrinter::RePrintRatio()
   for (i = 0; i < m_NumExtraChars; i++)
     *p++ = '\b';
   m_NumExtraChars = extraSize;
-  for (; size < m_NumExtraChars; size++)
+  for (; size < extraSize; size++)
     *p++ = ' ';
   MyStringCopy(p, s);
   (*OutStream) << fullString;