4.43 beta

7zip/Bundles/SFXCon/Main.cpp

@@ -168,19 +168,6 @@ NRecursedType::EEnum CArchiveCommand::DefaultRecursedType() const
   return kCommandRecursedDefault[CommandType];
 }
 
-static NRecursedType::EEnum GetRecursedTypeFromIndex(int index)
-{
-  switch (index)
-  {
-    case NRecursedPostCharIndex::kWildCardRecursionOnly: 
-      return NRecursedType::kWildCardOnlyRecursed;
-    case NRecursedPostCharIndex::kNoRecursion: 
-      return NRecursedType::kNonRecursed;
-    default:
-      return NRecursedType::kRecursed;
-  }
-}
-
 void PrintHelp(void)
 {
   g_StdOut << kHelpString;
@@ -198,12 +185,6 @@ static void PrintHelpAndExit() // yyy
   ShowMessageAndThrowException(kUserErrorMessage, NExitCode::kUserError);
 }
 
-static void PrintProcessTitle(const CSysString &processTitle, const UString &archiveName)
-{
-  g_StdOut << endl << processTitle << kProcessArchiveMessage << 
-      archiveName << endl << endl;
-}
-
 bool ParseArchiveCommand(const UString &commandString, CArchiveCommand &command)
 {
   UString commandStringUpper = commandString;
@@ -228,7 +209,7 @@ static bool AddNameToCensor(NWildcard::CCensor &wildcardCensor,
     return false;
   */
   bool isWildCard = DoesNameContainWildCard(name);
-  bool recursed;
+  bool recursed = false;
 
   switch (type)
   {
@@ -246,67 +227,20 @@ static bool AddNameToCensor(NWildcard::CCensor &wildcardCensor,
   return true;
 }
 
-void AddCommandLineWildCardToCensr(NWildcard::CCensor &wildcardCensor, 
+void AddCommandLineWildCardToCensor(NWildcard::CCensor &wildcardCensor, 
     const UString &name, bool include, NRecursedType::EEnum type)
 {
   if (!AddNameToCensor(wildcardCensor, name, include, type))
     ShowMessageAndThrowException(kIncorrectWildCardInCommandLine, NExitCode::kUserError);
 }
 
-static bool AreEqualNoCase(wchar_t c1, wchar_t c2)
-{
-  return ::MyCharUpper(c1) == ::MyCharUpper(c2);
-}
-
 void AddToCensorFromNonSwitchesStrings(NWildcard::CCensor &wildcardCensor, 
-    const UStringVector &nonSwitchStrings, NRecursedType::EEnum type, 
-    bool thereAreSwitchIncludeWildCards)
+    const UStringVector & /* nonSwitchStrings */, NRecursedType::EEnum type, 
+    bool /* thereAreSwitchIncludeWildCards */)
 {
-  AddCommandLineWildCardToCensr(wildcardCensor, kUniversalWildcard, true, type);
+  AddCommandLineWildCardToCensor(wildcardCensor, kUniversalWildcard, true, type);
 }
 
-/*
-void AddSwitchWildCardsToCensor(NWildcard::CCensor &wildcardCensor, 
-    const UStringVector &strings, bool include, NRecursedType::EEnum commonRecursedType)
-{
-  for(int i = 0; i < strings.Size(); i++)
-  {
-    const UString &string = strings[i];
-    NRecursedType::EEnum recursedType;
-    int pos = 0;
-    if (string.Length() < kSomeCludePostStringMinSize)
-      PrintHelpAndExit();
-    if (AreEqualNoCase(string[pos], kRecursedIDChar))
-    {
-      pos++;
-      int index = UString(kRecursedPostCharSet).Find(string[pos]);
-      recursedType = GetRecursedTypeFromIndex(index);
-      if (index >= 0)
-        pos++;
-    }
-    else
-      recursedType = commonRecursedType;
-    if (string.Length() < pos + kSomeCludeAfterRecursedPostStringMinSize)
-      PrintHelpAndExit();
-    UString tail = string.Mid(pos + 1);
-    if (AreEqualNoCase(string[pos], kImmediateNameID))
-      AddCommandLineWildCardToCensr(wildcardCensor, 
-          tail, include, recursedType);
-    else 
-      PrintHelpAndExit();
-  }
-}
-*/
-
-// ------------------------------------------------------------------
-/*
-static void ThrowPrintFileIsNotArchiveException(const CSysString &fileName)
-{
-  CSysString message;
-  message = kFileIsNotArchiveMessageBefore + fileName + kFileIsNotArchiveMessageAfter;
-  ShowMessageAndThrowException(message, NExitCode::kFileIsNotArchive);
-}
-*/
 
 #ifndef _WIN32
 static void GetArguments(int numArguments, const char *arguments[], UStringVector &parts)
@@ -443,10 +377,17 @@ int Main2(
       eo.OutputDir = outputDir;
       eo.YesToAll = yesToAll;
 
+      UString errorMessage;
       HRESULT result = DecompressArchives(
           v1, v2,
           wildcardCensorHead, 
-          eo, &openCallback, ecs);
+          eo, &openCallback, ecs, errorMessage);
+      if (!errorMessage.IsEmpty())
+      {
+        (*g_StdStream) << endl << "Error: " << errorMessage;;
+        if (result == S_OK)
+          result = E_FAIL;
+      }
 
       if (ecs->NumArchiveErrors != 0 || ecs->NumFileErrors != 0)
       {

7zip/Bundles/SFXCon/SFXCon.dsp

@@ -350,18 +350,6 @@ SOURCE=..\..\Crypto\7zAES\7zAES.cpp
 
 SOURCE=..\..\Crypto\7zAES\7zAES.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\7zAES\MySHA256.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\7zAES\SHA256.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Crypto\7zAES\SHA256.h
-# End Source File
 # End Group
 # Begin Group "AES"
 
@@ -406,6 +394,22 @@ SOURCE=..\..\Crypto\AES\MyAES.cpp
 SOURCE=..\..\Crypto\AES\MyAES.h
 # End Source File
 # End Group
+# Begin Group "Hash"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\Crypto\Hash\RotateDefs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Crypto\Hash\Sha256.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Crypto\Hash\Sha256.h
+# End Source File
+# End Group
 # End Group
 # Begin Group "SDK"
 

7zip/Bundles/SFXCon/makefile

@@ -104,7 +104,6 @@ PPMD_OPT_OBJS = \
 
 7ZAES_OPT_OBJS = \
   $O\7zAES.obj \
-  $O\SHA256.obj \
 
 AES_OPT_OBJS = \
   $O\MyAES.obj \
@@ -114,6 +113,9 @@ AES_ORIG_OBJS = \
   $O\aeskey.obj \
   $O\aestab.obj \
 
+CRYPTO_HASH_OBJS = \
+  $O\Sha256.obj \
+
 OBJS = \
   $O\StdAfx.obj \
   $(SFX_CONSOLE_OBJS) \
@@ -132,7 +134,7 @@ OBJS = \
   $(7ZAES_OPT_OBJS) \
   $(AES_OPT_OBJS) \
   $(AES_ORIG_OBJS) \
-  $(CRYPTO_ZIP_OBJS) \
+  $(CRYPTO_HASH_OBJS) \
   $O\resource.res
 
 
@@ -171,6 +173,8 @@ $O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp
 $(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
 	$(COMPL)
 $(AES_ORIG_OBJS): ../../Crypto/AES/$(*B).c
-	$(COMPL_O1)
+	$(COMPL_O1_W3)
 $(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
 	$(COMPL)
+$(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp
+	$(COMPL)