9.04 beta

CPP/7zip/UI/Console/Main.cpp

@@ -5,45 +5,44 @@
 #include "Common/MyInitGuid.h"
 
 #include "Common/CommandLineParser.h"
-#include "Common/MyException.h"
 #include "Common/IntToString.h"
+#include "Common/MyException.h"
 #include "Common/StdOutStream.h"
 #include "Common/StringConvert.h"
 #include "Common/StringToInt.h"
 
-#include "Windows/FileDir.h"
-#include "Windows/FileName.h"
 #include "Windows/Defs.h"
 #include "Windows/Error.h"
+#include "Windows/FileDir.h"
+#include "Windows/FileName.h"
 #ifdef _WIN32
 #include "Windows/MemoryLock.h"
 #endif
 
-#include "../../IPassword.h"
 #include "../../ICoder.h"
-#include "../Common/UpdateAction.h"
-#include "../Common/Update.h"
-#include "../Common/Extract.h"
+#include "../../IPassword.h"
+
 #include "../Common/ArchiveCommandLine.h"
 #include "../Common/ExitCode.h"
+#include "../Common/Extract.h"
 #ifdef EXTERNAL_CODECS
 #include "../Common/LoadCodecs.h"
 #endif
+#include "../Common/PropIDUtils.h"
+#include "../Common/Update.h"
+#include "../Common/UpdateAction.h"
 
 #include "../../Compress/LZMA_Alone/LzmaBenchCon.h"
 
+#include "ExtractCallbackConsole.h"
 #include "List.h"
 #include "OpenCallbackConsole.h"
-#include "ExtractCallbackConsole.h"
 #include "UpdateCallbackConsole.h"
 
 #include "../../MyVersion.h"
 
 #if defined( _WIN32) && defined( _7ZIP_LARGE_PAGES)
-extern "C"
-{
 #include "../../../../C/Alloc.h"
-}
 #endif
 
 using namespace NWindows;
@@ -108,8 +107,8 @@ static const char *kHelpString =
     "  -ssc[-]: set sensitive case mode\n"
     "  -ssw: compress shared files\n"
     "  -t{Type}: Set type of archive\n"
-    "  -v{Size}[b|k|m|g]: Create volumes\n"
     "  -u[-][p#][q#][r#][x#][y#][z#][!newArchiveName]: Update options\n"
+    "  -v{Size}[b|k|m|g]: Create volumes\n"
     "  -w[{path}]: assign Work directory. Empty path means a temporary directory\n"
     "  -x[r[-|0]]]{@listfile|!wildcard}: eXclude filenames\n"
     "  -y: assume Yes on all queries\n";
@@ -197,7 +196,7 @@ int Main2(
   GetArguments(numArguments, arguments, commandStrings);
   #endif
 
-  if(commandStrings.Size() == 1)
+  if (commandStrings.Size() == 1)
   {
     ShowCopyrightAndHelp(g_StdOut, true);
     return 0;
@@ -210,7 +209,7 @@ int Main2(
 
   parser.Parse1(commandStrings, options);
 
-  if(options.HelpMode)
+  if (options.HelpMode)
   {
     ShowCopyrightAndHelp(g_StdOut, true);
     return 0;
@@ -266,8 +265,8 @@ int Main2(
       #ifdef EXTERNAL_CODECS
       if (arc.LibIndex >= 0)
       {
-        char s[32];
-        ConvertUInt64ToString(arc.LibIndex, s);
+        char s[16];
+        ConvertUInt32ToString(arc.LibIndex, s);
         PrintString(stdStream, s, 2);
       }
       else
@@ -321,8 +320,8 @@ int Main2(
       int libIndex = codecs->GetCodecLibIndex(j);
       if (libIndex >= 0)
       {
-        char s[32];
-        ConvertUInt64ToString(libIndex, s);
+        char s[16];
+        ConvertUInt32ToString(libIndex, s);
         PrintString(stdStream, s, 2);
       }
       else
@@ -383,7 +382,7 @@ int Main2(
   }
   else if (isExtractGroupCommand || options.Command.CommandType == NCommandType::kList)
   {
-    if(isExtractGroupCommand)
+    if (isExtractGroupCommand)
     {
       CExtractCallbackConsole *ecs = new CExtractCallbackConsole;
       CMyComPtr<IFolderArchiveExtractCallback> extractCallback = ecs;
@@ -406,12 +405,14 @@ int Main2(
       #endif
 
       CExtractOptions eo;
+      eo.StdInMode = options.StdInMode;
       eo.StdOutMode = options.StdOutMode;
       eo.PathMode = options.Command.GetPathMode();
       eo.TestMode = options.Command.IsTestMode();
       eo.OverwriteMode = options.OverwriteMode;
       eo.OutputDir = options.OutputDir;
       eo.YesToAll = options.YesToAll;
+      eo.CalcCrc = options.CalcCrc;
       #ifdef COMPRESS_MT
       eo.Properties = options.ExtractProperties;
       #endif
@@ -457,6 +458,12 @@ int Main2(
       stdStream
            << "Size:       " << stat.UnpackSize << endl
            << "Compressed: " << stat.PackSize << endl;
+      if (options.CalcCrc)
+      {
+        wchar_t s[16];
+        ConvertUInt32ToHex(stat.CrcSum, s);
+        stdStream << "CRC: " << s << endl;
+      }
     }
     else
     {
@@ -464,6 +471,7 @@ int Main2(
       HRESULT result = ListArchives(
           codecs,
           formatIndices,
+          options.StdInMode,
           options.ArchivePathsSorted,
           options.ArchivePathsFullSorted,
           options.WildcardCensor.Pairs.Front().Head,
@@ -483,10 +491,8 @@ int Main2(
         throw CSystemException(result);
     }
   }
-  else if(options.Command.IsFromUpdateGroup())
+  else if (options.Command.IsFromUpdateGroup())
   {
-    UString workingDir;
-
     CUpdateOptions &uo = options.UpdateOptions;
     if (uo.SfxMode && uo.SfxModule.IsEmpty())
       uo.SfxModule = kDefaultSfxModule;