react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Common/ArchiveCommandLine.cpp

@@ -15,11 +15,10 @@
 
 #include <stdio.h>
 
-#ifdef Z7_LARGE_PAGES
+#ifdef _7ZIP_LARGE_PAGES
 #include "../../../../C/Alloc.h"
 #endif
 
-#include "../../../Common/IntToString.h"
 #include "../../../Common/ListFileUtils.h"
 #include "../../../Common/StringConvert.h"
 #include "../../../Common/StringToInt.h"
@@ -27,8 +26,6 @@
 #include "../../../Windows/ErrorMsg.h"
 #include "../../../Windows/FileDir.h"
 #include "../../../Windows/FileName.h"
-#include "../../../Windows/PropVariantConv.h"
-#include "../../../Windows/System.h"
 #ifdef _WIN32
 #include "../../../Windows/FileMapping.h"
 #include "../../../Windows/MemoryLock.h"
@@ -43,67 +40,23 @@
 extern bool g_CaseSensitive;
 extern bool g_PathTrailReplaceMode;
 
-#ifdef Z7_LARGE_PAGES
-extern
-bool g_LargePagesMode;
+#ifdef _7ZIP_LARGE_PAGES
 bool g_LargePagesMode = false;
 #endif
 
-/*
-#ifdef ENV_HAVE_LSTAT
-EXTERN_C_BEGIN
-extern int global_use_lstat;
-EXTERN_C_END
-#endif
-*/
-
 #ifdef UNDER_CE
 
 #define MY_IS_TERMINAL(x) false;
 
 #else
 
-static bool MY_IS_TERMINAL(FILE *x)
-{
-#ifdef _WIN32
-  /*
-crt/stdio.h:
-typedef struct _iobuf FILE;
-#define stdin  (&_iob[0])
-#define stdout (&_iob[1])
-#define stderr (&_iob[2])
-*/
-  // fprintf(stderr, "\nMY_IS_TERMINAL = %p", x);
-  const int fd = _fileno(x);
-  /* (fd) is 0, 1 or 2 in console program.
-     docs: If stdout or stderr is not associated with
-     an output stream (for example, in a Windows application
-     without a console window), the file descriptor returned is -2.
-     In previous versions, the file descriptor returned was -1.
-  */
-  if (fd < 0) // is not associated with an output stream application (without a console window)
-    return false;
-  // fprintf(stderr, "\n\nstderr _fileno(%p) = %d", x, fd);
-  if (!_isatty(fd))
-    return false;
-  // fprintf(stderr, "\nisatty_val = true");
-  const HANDLE h = (HANDLE)_get_osfhandle(fd);
-  /* _get_osfhandle() returns intptr_t in new SDK, or long in MSVC6.
-     Also it can return (INVALID_HANDLE_VALUE).
-     docs: _get_osfhandle also returns the special value -2 when
-     the file descriptor is not associated with a stream
-     in old msvcrt.dll: it returns (-1) for incorrect value
-  */
-  // fprintf(stderr, "\n_get_osfhandle() = %p", (void *)h);
-  if (h == NULL || h == INVALID_HANDLE_VALUE)
-    return false;
-  DWORD st;
-  // fprintf(stderr, "\nGetConsoleMode() = %u", (unsigned)GetConsoleMode(h, &st));
-  return GetConsoleMode(h, &st) != 0;
+#if _MSC_VER >= 1400
+#define MY_isatty_fileno(x) _isatty(_fileno(x))
 #else
-  return isatty(fileno(x)) != 0;
+#define MY_isatty_fileno(x) isatty(fileno(x))
 #endif
-}
+
+#define MY_IS_TERMINAL(x) (MY_isatty_fileno(x) != 0);
 
 #endif
 
@@ -121,6 +74,8 @@ static bool StringToUInt32(const wchar_t *s, UInt32 &v)
 }
 
 
+int g_CodePage = -1;
+
 namespace NKey {
 enum Enum
 {
@@ -163,9 +118,6 @@ enum Enum
   kSfx,
   kEmail,
   kHash,
-  // kHashGenFile,
-  kHashDir,
-  kExtractMemLimit,
  
   kStdIn,
   kStdOut,
@@ -174,30 +126,20 @@ enum Enum
   kListfileCharSet,
   kConsoleCharSet,
   kTechMode,
-  kListFields,
-  kListPathSlash,
-  kListTimestampUTC,
   
-  kPreserveATime,
   kShareForWrite,
   kStopAfterOpenError,
   kCaseSensitive,
   kArcNameMode,
 
-  kUseSlashMark,
   kDisableWildcardParsing,
   kElimDup,
   kFullPathMode,
   
   kHardLinks,
-  kSymLinks_AllowDangerous,
   kSymLinks,
   kNtSecurity,
-
-  kStoreOwnerId,
-  kStoreOwnerName,
   
-  kZoneFile,
   kAltStreams,
   kReplaceColonForAltStream,
   kWriteToAltStreamIfColon,
@@ -207,7 +149,7 @@ enum Enum
   kDeleteAfterCompressing,
   kSetArcMTime
 
-  #ifndef Z7_NO_CRYPTO
+  #ifndef _NO_CRYPTO
   , kPassword
   #endif
 };
@@ -222,7 +164,7 @@ static const char * const k_ArcNameMode_PostCharSet = "sea";
 
 static const char * const k_Stream_PostCharSet = "012";
 
-static inline EArcNameMode ParseArcNameMode(int postCharIndex)
+static inline const EArcNameMode ParseArcNameMode(int postCharIndex)
 {
   switch (postCharIndex)
   {
@@ -240,15 +182,12 @@ namespace NRecursedPostCharIndex {
   };
 }
 
-// static const char
-#define kImmediateNameID '!'
-#ifdef _WIN32
-#define kMapNameID '#'
-#endif
-#define kFileListID '@'
+static const char kImmediateNameID = '!';
+static const char kMapNameID = '#';
+static const char kFileListID = '@';
 
-static const Byte kSomeCludePostStringMinSize = 2; // at least <@|!><N>ame must be
-static const Byte kSomeCludeAfterRecursedPostStringMinSize = 2; // at least <@|!><N>ame must be
+static const char kSomeCludePostStringMinSize = 2; // at least <@|!><N>ame must be
+static const char kSomeCludeAfterRecursedPostStringMinSize = 2; // at least <@|!><N>ame must be
 
 static const char * const kOverwritePostCharSet = "asut";
 
@@ -260,106 +199,80 @@ static const NExtract::NOverwriteMode::EEnum k_OverwriteModes[] =
   NExtract::NOverwriteMode::kRenameExisting
 };
 
-
-
-#define SWFRM_3(t, mu, mi) t, mu, mi, NULL
-
-#define SWFRM_1(t) SWFRM_3(t, false, 0)
-#define SWFRM_SIMPLE SWFRM_1(NSwitchType::kSimple)
-#define SWFRM_MINUS  SWFRM_1(NSwitchType::kMinus)
-#define SWFRM_STRING SWFRM_1(NSwitchType::kString)
-
-#define SWFRM_STRING_SINGL(mi) SWFRM_3(NSwitchType::kString, false, mi)
-#define SWFRM_STRING_MULT(mi)  SWFRM_3(NSwitchType::kString, true, mi)
-
-
 static const CSwitchForm kSwitchForms[] =
 {
-  { "?", SWFRM_SIMPLE },
-  { "h", SWFRM_SIMPLE },
-  { "-help", SWFRM_SIMPLE },
+  { "?" },
+  { "h" },
+  { "-help" },
   
-  { "ba", SWFRM_SIMPLE },
-  { "bd", SWFRM_SIMPLE },
-  { "bt", SWFRM_SIMPLE },
-  { "bb", SWFRM_STRING_SINGL(0) },
+  { "ba" },
+  { "bd" },
+  { "bt" },
+  { "bb", NSwitchType::kString, false, 0 },
 
   { "bso", NSwitchType::kChar, false, 1, k_Stream_PostCharSet },
   { "bse", NSwitchType::kChar, false, 1, k_Stream_PostCharSet },
   { "bsp", NSwitchType::kChar, false, 1, k_Stream_PostCharSet },
   
-  { "y", SWFRM_SIMPLE },
+  { "y" },
   
-  { "ad", SWFRM_SIMPLE },
+  { "ad" },
   { "ao", NSwitchType::kChar, false, 1, kOverwritePostCharSet},
 
-  { "t",  SWFRM_STRING_SINGL(1) },
-  { "stx", SWFRM_STRING_MULT(1) },
+  { "t",  NSwitchType::kString, false, 1 },
+  { "stx", NSwitchType::kString, true, 1 },
   
-  { "m",  SWFRM_STRING_MULT(1) },
-  { "o",  SWFRM_STRING_SINGL(1) },
-  { "w",  SWFRM_STRING },
-
-  { "i",  SWFRM_STRING_MULT(kSomeCludePostStringMinSize) },
-  { "x",  SWFRM_STRING_MULT(kSomeCludePostStringMinSize) },
-  { "ai", SWFRM_STRING_MULT(kSomeCludePostStringMinSize) },
-  { "ax", SWFRM_STRING_MULT(kSomeCludePostStringMinSize) },
-  { "an", SWFRM_SIMPLE },
+  { "m",  NSwitchType::kString, true, 1 },
+  { "o",  NSwitchType::kString, false, 1 },
+  { "w",  NSwitchType::kString },
+
+  { "i",  NSwitchType::kString, true, kSomeCludePostStringMinSize},
+  { "x",  NSwitchType::kString, true, kSomeCludePostStringMinSize},
+  { "ai", NSwitchType::kString, true, kSomeCludePostStringMinSize},
+  { "ax", NSwitchType::kString, true, kSomeCludePostStringMinSize},
+  { "an" },
   
-  { "u",  SWFRM_STRING_MULT(1) },
-  { "v",  SWFRM_STRING_MULT(1) },
+  { "u",  NSwitchType::kString, true, 1},
+  { "v",  NSwitchType::kString, true, 1},
   { "r",  NSwitchType::kChar, false, 0, kRecursedPostCharSet },
   
-  { "stm", SWFRM_STRING },
-  { "sfx", SWFRM_STRING },
-  { "seml", SWFRM_STRING_SINGL(0) },
-  { "scrc", SWFRM_STRING_MULT(0) },
-  // { "scrf", SWFRM_STRING_SINGL(1) },
-  { "shd", SWFRM_STRING_SINGL(1) },
-  { "smemx", SWFRM_STRING },
+  { "stm", NSwitchType::kString },
+  { "sfx", NSwitchType::kString },
+  { "seml", NSwitchType::kString, false, 0},
+  { "scrc", NSwitchType::kString, true, 0 },
   
-  { "si", SWFRM_STRING },
-  { "so", SWFRM_SIMPLE },
-
-  { "slp", SWFRM_STRING },
-  { "scs", SWFRM_STRING },
-  { "scc", SWFRM_STRING },
-  { "slt", SWFRM_SIMPLE },
-  { "slf", SWFRM_STRING_SINGL(1) },
-  { "slsl", SWFRM_MINUS },
-  { "slmu", SWFRM_MINUS },
-
-  { "ssp", SWFRM_SIMPLE },
-  { "ssw", SWFRM_SIMPLE },
-  { "sse", SWFRM_SIMPLE },
-  { "ssc", SWFRM_MINUS },
+  { "si", NSwitchType::kString },
+  { "so" },
+
+  { "slp", NSwitchType::kString },
+  { "scs", NSwitchType::kString },
+  { "scc", NSwitchType::kString },
+  { "slt" },
+
+  { "ssw" },
+  { "sse" },
+  { "ssc", NSwitchType::kMinus },
   { "sa",  NSwitchType::kChar, false, 1, k_ArcNameMode_PostCharSet },
   
-  { "spm", SWFRM_STRING_SINGL(0) },
-  { "spd", SWFRM_SIMPLE },
-  { "spe", SWFRM_MINUS },
-  { "spf", SWFRM_STRING_SINGL(0) },
+  { "spd" },
+  { "spe", NSwitchType::kMinus },
+  { "spf", NSwitchType::kString, false, 0 },
   
-  { "snh", SWFRM_MINUS },
-  { "snld", SWFRM_STRING },
-  { "snl", SWFRM_MINUS },
-  { "sni", SWFRM_SIMPLE },
-
-  { "snoi", SWFRM_MINUS },
-  { "snon", SWFRM_MINUS },
+  { "snh", NSwitchType::kMinus },
+  { "snl", NSwitchType::kMinus },
+  { "sni" },
   
-  { "snz", SWFRM_STRING_SINGL(0) },
-  { "sns", SWFRM_MINUS },
-  { "snr", SWFRM_SIMPLE },
-  { "snc", SWFRM_SIMPLE },
+  { "sns", NSwitchType::kMinus },
+  { "snr" },
+  { "snc" },
   
-  { "snt", SWFRM_MINUS },
+  { "snt", NSwitchType::kMinus },
   
-  { "sdel", SWFRM_SIMPLE },
-  { "stl", SWFRM_SIMPLE }
+  { "sdel" },
+  { "stl" }
 
-  #ifndef Z7_NO_CRYPTO
-  , { "p", SWFRM_STRING }
+  #ifndef _NO_CRYPTO
+  , { "p",  NSwitchType::kString }
   #endif
 };
 
@@ -368,7 +281,7 @@ static const unsigned kMinNonSwitchWords = 1;
 static const unsigned kCommandIndex = 0;
 
 // static const char * const kUserErrorMessage  = "Incorrect command line";
-// static const char * const kCannotFindListFile = "Cannot find listfile";
+static const char * const kCannotFindListFile = "Cannot find listfile";
 static const char * const kIncorrectListFile = "Incorrect item in listfile.\nCheck charset encoding and -scs switch.";
 static const char * const kTerminalOutError = "I won't write compressed data to a terminal";
 static const char * const kSameTerminalError = "I won't write data and program's messages to same stream";
@@ -376,41 +289,38 @@ static const char * const kEmptyFilePath = "Empty file path";
 
 bool CArcCommand::IsFromExtractGroup() const
 {
-  switch ((int)CommandType)
+  switch (CommandType)
   {
     case NCommandType::kTest:
     case NCommandType::kExtract:
     case NCommandType::kExtractFull:
       return true;
-    default:
-      return false;
   }
+  return false;
 }
 
 NExtract::NPathMode::EEnum CArcCommand::GetPathMode() const
 {
-  switch ((int)CommandType)
+  switch (CommandType)
   {
     case NCommandType::kTest:
     case NCommandType::kExtractFull:
       return NExtract::NPathMode::kFullPaths;
-    default:
-      return NExtract::NPathMode::kNoPaths;
   }
+  return NExtract::NPathMode::kNoPaths;
 }
 
 bool CArcCommand::IsFromUpdateGroup() const
 {
-  switch ((int)CommandType)
+  switch (CommandType)
   {
     case NCommandType::kAdd:
     case NCommandType::kUpdate:
     case NCommandType::kDelete:
     case NCommandType::kRename:
       return true;
-    default:
-      return false;
   }
+  return false;
 }
 
 static NRecursedType::EEnum GetRecursedTypeFromIndex(int index)
@@ -453,28 +363,12 @@ static bool ParseArchiveCommand(const UString &commandString, CArcCommand &comma
 // ------------------------------------------------------------------
 // filenames functions
 
-struct CNameOption
-{
-  bool Include;
-  bool WildcardMatching;
-  Byte MarkMode;
-  NRecursedType::EEnum RecursedType;
-
-  CNameOption():
-      Include(true),
-      WildcardMatching(true),
-      MarkMode(NWildcard::kMark_FileOrDir),
-      RecursedType(NRecursedType::kNonRecursed)
-      {}
-};
-
-
 static void AddNameToCensor(NWildcard::CCensor &censor,
-    const CNameOption &nop, const UString &name)
+    const UString &name, bool include, NRecursedType::EEnum type, bool wildcardMatching)
 {
   bool recursed = false;
 
-  switch ((int)nop.RecursedType)
+  switch (type)
   {
     case NRecursedType::kWildcardOnlyRecursed:
       recursed = DoesNameContainWildcard(name);
@@ -482,18 +376,10 @@ static void AddNameToCensor(NWildcard::CCensor &censor,
     case NRecursedType::kRecursed:
       recursed = true;
       break;
-    default:
-      break;
   }
-
-  NWildcard::CCensorPathProps props;
-  props.Recursive = recursed;
-  props.WildcardMatching = nop.WildcardMatching;
-  props.MarkMode = nop.MarkMode;
-  censor.AddPreItem(nop.Include, name, props);
+  censor.AddPreItem(include, name, recursed, wildcardMatching);
 }
 
-#ifndef Z7_EXTRACT_ONLY
 static void AddRenamePair(CObjectVector<CRenamePair> *renamePairs,
     const UString &oldName, const UString &newName, NRecursedType::EEnum type,
     bool wildcardMatching)
@@ -518,18 +404,15 @@ static void AddRenamePair(CObjectVector<CRenamePair> *renamePairs,
     throw CArcCmdLineException("Unsupported rename command:", val);
   }
 }
-#endif
 
 static void AddToCensorFromListFile(
     CObjectVector<CRenamePair> *renamePairs,
     NWildcard::CCensor &censor,
-    const CNameOption &nop, LPCWSTR fileName, UInt32 codePage)
+    LPCWSTR fileName, bool include, NRecursedType::EEnum type, bool wildcardMatching, Int32 codePage)
 {
   UStringVector names;
-  /*
-  if (!NFind::DoesFileExist_FollowLink(us2fs(fileName)))
+  if (!NFind::DoesFileExist(us2fs(fileName)))
     throw CArcCmdLineException(kCannotFindListFile, fileName);
-  */
   DWORD lastError = 0;
   if (!ReadNamesFromListFile2(us2fs(fileName), names, codePage, lastError))
   {
@@ -545,21 +428,17 @@ static void AddToCensorFromListFile(
   }
   if (renamePairs)
   {
-    #ifndef Z7_EXTRACT_ONLY
     if ((names.Size() & 1) != 0)
       throw CArcCmdLineException(kIncorrectListFile, fileName);
     for (unsigned i = 0; i < names.Size(); i += 2)
     {
       // change type !!!!
-      AddRenamePair(renamePairs, names[i], names[i + 1], nop.RecursedType, nop.WildcardMatching);
+      AddRenamePair(renamePairs, names[i], names[i + 1], type, wildcardMatching);
     }
-    #else
-    throw "not implemented";
-    #endif
   }
   else
     FOR_VECTOR (i, names)
-      AddNameToCensor(censor, nop, names[i]);
+      AddNameToCensor(censor, names[i], include, type, wildcardMatching);
 }
 
 static void AddToCensorFromNonSwitchesStrings(
@@ -568,32 +447,19 @@ static void AddToCensorFromNonSwitchesStrings(
     NWildcard::CCensor &censor,
     const UStringVector &nonSwitchStrings,
     int stopSwitchIndex,
-    const CNameOption &nop,
-    bool thereAreSwitchIncludes, UInt32 codePage)
+    NRecursedType::EEnum type,
+    bool wildcardMatching,
+    bool thereAreSwitchIncludes, Int32 codePage)
 {
-  // another default
   if ((renamePairs || nonSwitchStrings.Size() == startIndex) && !thereAreSwitchIncludes)
-  {
-    /* for rename command: -i switch sets the mask for archive item reading.
-       if (thereAreSwitchIncludes), { we don't use UniversalWildcard. }
-       also for non-rename command: we set UniversalWildcard, only if there are no nonSwitches. */
-    // we use default fileds in (CNameOption) for UniversalWildcard.
-    CNameOption nop2;
-    // recursive mode is not important for UniversalWildcard (*)
-    // nop2.RecursedType = nop.RecursedType; // we don't need it
-    /*
-    nop2.RecursedType = NRecursedType::kNonRecursed;
-    nop2.Include = true;
-    nop2.WildcardMatching = true;
-    nop2.MarkMode = NWildcard::kMark_FileOrDir;
-    */
-    AddNameToCensor(censor, nop2, UString(kUniversalWildcard));
-  }
+    AddNameToCensor(censor, UString(kUniversalWildcard), true, type,
+        true // wildcardMatching
+        );
 
   int oldIndex = -1;
   
   if (stopSwitchIndex < 0)
-    stopSwitchIndex = (int)nonSwitchStrings.Size();
+    stopSwitchIndex = nonSwitchStrings.Size();
 
   for (unsigned i = startIndex; i < nonSwitchStrings.Size(); i++)
   {
@@ -601,30 +467,26 @@ static void AddToCensorFromNonSwitchesStrings(
     if (s.IsEmpty())
       throw CArcCmdLineException(kEmptyFilePath);
     if (i < (unsigned)stopSwitchIndex && s[0] == kFileListID)
-      AddToCensorFromListFile(renamePairs, censor, nop, s.Ptr(1), codePage);
+      AddToCensorFromListFile(renamePairs, censor, s.Ptr(1), true, type, wildcardMatching, codePage);
     else if (renamePairs)
     {
-      #ifndef Z7_EXTRACT_ONLY
       if (oldIndex == -1)
-        oldIndex = (int)i;
+        oldIndex = i;
       else
       {
         // NRecursedType::EEnum type is used for global wildcard (-i! switches)
-        AddRenamePair(renamePairs, nonSwitchStrings[(unsigned)oldIndex], s, NRecursedType::kNonRecursed, nop.WildcardMatching);
+        AddRenamePair(renamePairs, nonSwitchStrings[oldIndex], s, NRecursedType::kNonRecursed, wildcardMatching);
         // AddRenamePair(renamePairs, nonSwitchStrings[oldIndex], s, type);
         oldIndex = -1;
       }
-      #else
-      throw "not implemented";
-      #endif
     }
     else
-      AddNameToCensor(censor, nop, s);
+      AddNameToCensor(censor, s, true, type, wildcardMatching);
   }
   
   if (oldIndex != -1)
   {
-    throw CArcCmdLineException("There is no second file name for rename pair:", nonSwitchStrings[(unsigned)oldIndex]);
+    throw CArcCmdLineException("There is no second file name for rename pair:", nonSwitchStrings[oldIndex]);
   }
 }
 
@@ -647,31 +509,32 @@ static const char * const k_IncorrectMapCommand = "Incorrect Map command";
 
 static const char *ParseMapWithPaths(
     NWildcard::CCensor &censor,
-    const UString &s2,
-    const CNameOption &nop)
+    const UString &s2, bool include,
+    NRecursedType::EEnum commonRecursedType,
+    bool wildcardMatching)
 {
   UString s (s2);
-  const int pos = s.Find(L':');
+  int pos = s.Find(L':');
   if (pos < 0)
     return k_IncorrectMapCommand;
-  const int pos2 = s.Find(L':', (unsigned)(pos + 1));
+  int pos2 = s.Find(L':', pos + 1);
   if (pos2 < 0)
     return k_IncorrectMapCommand;
 
-  CEventSetEnd eventSetEnd((const wchar_t *)s + (unsigned)(pos2 + 1));
-  s.DeleteFrom((unsigned)pos2);
+  CEventSetEnd eventSetEnd((const wchar_t *)s + ((unsigned)pos2 + 1));
+  s.DeleteFrom(pos2);
   UInt32 size;
-  if (!StringToUInt32(s.Ptr((unsigned)(pos + 1)), size)
+  if (!StringToUInt32(s.Ptr(pos + 1), size)
       || size < sizeof(wchar_t)
       || size > ((UInt32)1 << 31)
       || size % sizeof(wchar_t) != 0)
     return "Unsupported Map data size";
 
-  s.DeleteFrom((unsigned)pos);
+  s.DeleteFrom(pos);
   CFileMapping map;
   if (map.Open(FILE_MAP_READ, GetSystemString(s)) != 0)
-    return "Cannot open mapping";
-  const LPVOID data = map.Map(FILE_MAP_READ, 0, size);
+    return "Can not open mapping";
+  LPVOID data = map.Map(FILE_MAP_READ, 0, size);
   if (!data)
     return "MapViewOfFile error";
   CFileUnmapper unmapper(data);
@@ -680,14 +543,14 @@ static const char *ParseMapWithPaths(
   const wchar_t *p = (const wchar_t *)data;
   if (*p != 0) // data format marker
     return "Unsupported Map data";
-  const UInt32 numChars = size / sizeof(wchar_t);
+  UInt32 numChars = size / sizeof(wchar_t);
   for (UInt32 i = 1; i < numChars; i++)
   {
-    const wchar_t c = p[i];
+    wchar_t c = p[i];
     if (c == 0)
     {
       // MessageBoxW(0, name, L"7-Zip", 0);
-      AddNameToCensor(censor, nop, name);
+      AddNameToCensor(censor, name, include, commonRecursedType, wildcardMatching);
       name.Empty();
     }
     else
@@ -703,15 +566,17 @@ static const char *ParseMapWithPaths(
 
 static void AddSwitchWildcardsToCensor(
     NWildcard::CCensor &censor,
-    const UStringVector &strings,
-    const CNameOption &nop,
-    UInt32 codePage)
+    const UStringVector &strings, bool include,
+    NRecursedType::EEnum commonRecursedType,
+    bool wildcardMatching,
+    Int32 codePage)
 {
   const char *errorMessage = NULL;
   unsigned i;
   for (i = 0; i < strings.Size(); i++)
   {
     const UString &name = strings[i];
+    NRecursedType::EEnum recursedType;
     unsigned pos = 0;
     
     if (name.Len() < kSomeCludePostStringMinSize)
@@ -719,100 +584,21 @@ static void AddSwitchWildcardsToCensor(
       errorMessage = "Too short switch";
       break;
     }
-
-    if (!nop.Include)
-    {
-      if (name.IsEqualTo_Ascii_NoCase("td"))
-      {
-        censor.ExcludeDirItems = true;
-        continue;
-      }
-      if (name.IsEqualTo_Ascii_NoCase("tf"))
-      {
-        censor.ExcludeFileItems = true;
-        continue;
-      }
-    }
-
-    CNameOption nop2 = nop;
-
-    bool type_WasUsed = false;
-    bool recursed_WasUsed = false;
-    bool matching_WasUsed = false;
-    bool error = false;
-
-    for (;;)
+    
+    if (::MyCharLower_Ascii(name[pos]) == kRecursedIDChar)
     {
-      wchar_t c = ::MyCharLower_Ascii(name[pos]);
-      if (c == kRecursedIDChar)
-      {
-        if (recursed_WasUsed)
-        {
-          error = true;
-          break;
-        }
-        recursed_WasUsed = true;
-        pos++;
-        c = name[pos];
-        int index = -1;
-        if (c <= 0x7F)
-          index = FindCharPosInString(kRecursedPostCharSet, (char)c);
-        nop2.RecursedType = GetRecursedTypeFromIndex(index);
-        if (index >= 0)
-        {
-          pos++;
-          continue;
-        }
-      }
-      
-      if (c == 'w')
-      {
-        if (matching_WasUsed)
-        {
-          error = true;
-          break;
-        }
-        matching_WasUsed = true;
-        nop2.WildcardMatching = true;
-        pos++;
-        if (name[pos] == '-')
-        {
-          nop2.WildcardMatching = false;
-          pos++;
-        }
-      }
-      else if (c == 'm')
-      {
-        if (type_WasUsed)
-        {
-          error = true;
-          break;
-        }
-        type_WasUsed = true;
+      pos++;
+      wchar_t c = name[pos];
+      int index = -1;
+      if (c <= 0x7F)
+        index = FindCharPosInString(kRecursedPostCharSet, (char)c);
+      recursedType = GetRecursedTypeFromIndex(index);
+      if (index >= 0)
         pos++;
-        nop2.MarkMode = NWildcard::kMark_StrictFile;
-        c = name[pos];
-        if (c == '-')
-        {
-          nop2.MarkMode = NWildcard::kMark_FileOrDir;
-          pos++;
-        }
-        else if (c == '2')
-        {
-          nop2.MarkMode = NWildcard::kMark_StrictFile_IfWildcard;
-          pos++;
-        }
-      }
-      else
-        break;
     }
+    else
+      recursedType = commonRecursedType;
     
-    if (error)
-    {
-      errorMessage = "inorrect switch";
-      break;
-    }
-
     if (name.Len() < pos + kSomeCludeAfterRecursedPostStringMinSize)
     {
       errorMessage = "Too short switch";
@@ -820,17 +606,15 @@ static void AddSwitchWildcardsToCensor(
     }
     
     const UString tail = name.Ptr(pos + 1);
-   
-    const wchar_t c = name[pos];
-
-    if (c == kImmediateNameID)
-      AddNameToCensor(censor, nop2, tail);
-    else if (c == kFileListID)
-      AddToCensorFromListFile(NULL, censor, nop2, tail, codePage);
+    
+    if (name[pos] == kImmediateNameID)
+      AddNameToCensor(censor, tail, include, recursedType, wildcardMatching);
+    else if (name[pos] == kFileListID)
+      AddToCensorFromListFile(NULL, censor, tail, include, recursedType, wildcardMatching, codePage);
     #ifdef _WIN32
-    else if (c == kMapNameID)
+    else if (name[pos] == kMapNameID)
     {
-      errorMessage = ParseMapWithPaths(censor, tail, nop2);
+      errorMessage = ParseMapWithPaths(censor, tail, include, recursedType, wildcardMatching);
       if (errorMessage)
         break;
     }
@@ -841,7 +625,6 @@ static void AddSwitchWildcardsToCensor(
       break;
     }
   }
-
   if (i != strings.Size())
     throw CArcCmdLineException(errorMessage, strings[i]);
 }
@@ -884,9 +667,9 @@ static bool ParseUpdateCommandString2(const UString &command,
     if (i >= command.Len())
       return false;
     c = command[i];
-    if (c < '0' || c >= (wchar_t)('0' + kNumUpdatePairActions))
+    if (c < '0' || c >= '0' + kNumUpdatePairActions)
       return false;
-    unsigned actionPos = (unsigned)(c - '0');
+    unsigned actionPos = c - '0';
     actionSet.StateActions[(unsigned)statePos] = (NUpdateArchive::NPairAction::EEnum)(actionPos);
     if (kUpdatePairStateNotSupportedActions[(unsigned)statePos] == (int)actionPos)
       return false;
@@ -951,7 +734,7 @@ static void SetAddCommandOptions(
     CUpdateOptions &options)
 {
   NUpdateArchive::CActionSet defaultActionSet;
-  switch ((int)commandType)
+  switch (commandType)
   {
     case NCommandType::kAdd:
       defaultActionSet = NUpdateArchive::k_ActionSet_Add;
@@ -990,10 +773,8 @@ static void SetAddCommandOptions(
     FOR_VECTOR (i, sv)
     {
       UInt64 size;
-      if (!ParseComplexSize(sv[i], size))
+      if (!ParseComplexSize(sv[i], size) || size == 0)
         throw CArcCmdLineException("Incorrect volume size:", sv[i]);
-      if (i == sv.Size() - 1 && size == 0)
-        throw CArcCmdLineException("zero size last volume is not allowed");
       options.VolumesSizes.Add(size);
     }
   }
@@ -1010,8 +791,8 @@ static void SetMethodOptions(const CParser &parser, CObjectVector<CProperty> &pr
       int index = prop.Name.Find(L'=');
       if (index >= 0)
       {
-        prop.Value = prop.Name.Ptr((unsigned)(index + 1));
-        prop.Name.DeleteFrom((unsigned)index);
+        prop.Value = prop.Name.Ptr(index + 1);
+        prop.Name.DeleteFrom(index);
       }
       properties.Add(prop);
     }
@@ -1022,25 +803,14 @@ static void SetMethodOptions(const CParser &parser, CObjectVector<CProperty> &pr
 static inline void SetStreamMode(const CSwitchResult &sw, unsigned &res)
 {
   if (sw.ThereIs)
-    res = (unsigned)sw.PostCharIndex;
+    res = sw.PostCharIndex;
 }
 
 
-#if defined(_WIN32) && !defined(UNDER_CE)
-static void PrintHex(UString &s, UInt64 v)
-{
-  char temp[32];
-  ConvertUInt64ToHex(v, temp);
-  s += temp;
-}
-#endif
-
-
 void CArcCmdLineParser::Parse1(const UStringVector &commandStrings,
     CArcCmdLineOptions &options)
 {
-  Parse1Log.Empty();
-  if (!parser.ParseStrings(kSwitchForms, Z7_ARRAY_SIZE(kSwitchForms), commandStrings))
+  if (!parser.ParseStrings(kSwitchForms, ARRAY_SIZE(kSwitchForms), commandStrings))
     throw CArcCmdLineException(parser.ErrorMessage, parser.ErrorLine);
 
   options.IsInTerminal = MY_IS_TERMINAL(stdin);
@@ -1048,29 +818,13 @@ void CArcCmdLineParser::Parse1(const UStringVector &commandStrings,
   options.IsStdErrTerminal = MY_IS_TERMINAL(stderr);
 
   options.HelpMode = parser[NKey::kHelp1].ThereIs || parser[NKey::kHelp2].ThereIs  || parser[NKey::kHelp3].ThereIs;
-  options.YesToAll = parser[NKey::kYes].ThereIs;
 
   options.StdInMode = parser[NKey::kStdIn].ThereIs;
   options.StdOutMode = parser[NKey::kStdOut].ThereIs;
   options.EnableHeaders = !parser[NKey::kDisableHeaders].ThereIs;
-  if (parser[NKey::kListFields].ThereIs)
-  {
-    const UString &s = parser[NKey::kListFields].PostStrings[0];
-    options.ListFields = GetAnsiString(s);
-  }
-  if (parser[NKey::kListPathSlash].ThereIs)
-  {
-    options.ListPathSeparatorSlash.Val = !parser[NKey::kListPathSlash].WithMinus;
-    options.ListPathSeparatorSlash.Def = true;
-  }
-  if (parser[NKey::kListTimestampUTC].ThereIs)
-    g_Timestamp_Show_UTC = !parser[NKey::kListTimestampUTC].WithMinus;
   options.TechMode = parser[NKey::kTechMode].ThereIs;
   options.ShowTime = parser[NKey::kShowTime].ThereIs;
 
-  if (parser[NKey::kDisablePercents].ThereIs)
-    options.DisablePercents = true;
-
   if (parser[NKey::kDisablePercents].ThereIs
       || options.StdOutMode
       || !options.IsStdOutTerminal)
@@ -1099,9 +853,9 @@ void CArcCmdLineParser::Parse1(const UStringVector &commandStrings,
 
   if (parser[NKey::kCaseSensitive].ThereIs)
   {
-    options.CaseSensitive =
     g_CaseSensitive = !parser[NKey::kCaseSensitive].WithMinus;
-    options.CaseSensitive_Change = true;
+    options.CaseSensitiveChange = true;
+    options.CaseSensitive = g_CaseSensitive;
   }
 
 
@@ -1113,28 +867,26 @@ void CArcCmdLineParser::Parse1(const UStringVector &commandStrings,
 
   if (parser[NKey::kLargePages].ThereIs)
   {
-    UInt32 slp = 0;
+    unsigned slp = 0;
     const UString &s = parser[NKey::kLargePages].PostStrings[0];
     if (s.IsEmpty())
       slp = 1;
-    else if (!s.IsEqualTo("-"))
+    else if (s != L"-")
     {
       if (!StringToUInt32(s, slp))
         throw CArcCmdLineException("Unsupported switch postfix for -slp", s);
     }
     
-    #ifdef Z7_LARGE_PAGES
+    #ifdef _7ZIP_LARGE_PAGES
     if (slp >
-          #if defined(_WIN32) && !defined(UNDER_CE)
+          #ifndef UNDER_CE
             (unsigned)NSecurity::Get_LargePages_RiskLevel()
           #else
             0
           #endif
         )
     {
-      #ifdef _WIN32 // change it !
       SetLargePageSize();
-      #endif
       // note: this process also can inherit that Privilege from parent process
       g_LargePagesMode =
       #if defined(_WIN32) && !defined(UNDER_CE)
@@ -1147,93 +899,39 @@ void CArcCmdLineParser::Parse1(const UStringVector &commandStrings,
   }
 
 
-#ifndef UNDER_CE
+  #ifndef UNDER_CE
 
   if (parser[NKey::kAffinity].ThereIs)
   {
     const UString &s = parser[NKey::kAffinity].PostStrings[0];
     if (!s.IsEmpty())
     {
+      UInt32 v = 0;
       AString a;
       a.SetFromWStr_if_Ascii(s);
-      Parse1Log += "Set process affinity mask: ";
-
-      bool isError = false;
-
-#ifdef _WIN32
-
-      UInt64 v = 0;
+      if (!a.IsEmpty())
       {
         const char *end;
-        v = ConvertHexStringToUInt64(a, &end);
+        v = ConvertHexStringToUInt32(a, &end);
         if (*end != 0)
           a.Empty();
       }
       if (a.IsEmpty())
-        isError = true;
-      else
-      {
-#ifndef _WIN64
-        if (v >= ((UInt64)1 << 32))
-          throw CArcCmdLineException("unsupported value -stm", s);
-        else
-#endif
-        {
-          PrintHex(Parse1Log, v);
-          if (!SetProcessAffinityMask(GetCurrentProcess(), (DWORD_PTR)v))
-          {
-            const DWORD lastError = GetLastError();
-            Parse1Log += " : ERROR : ";
-            Parse1Log += NError::MyFormatMessage(lastError);
-          }
-        }
-      }
-      
-#else // _WIN32
-      
-      if (a.Len() != s.Len())
-        isError = true;
-      else
-      {
-        Parse1Log += a;
-        NSystem::CProcessAffinity aff;
-        aff.CpuZero();
-        unsigned cpu = 0;
-        unsigned i = a.Len();
-        while (i)
-        {
-          unsigned v = (Byte)a[--i];
-          Z7_PARSE_HEX_DIGIT(v, { isError = true; break; })
-          for (unsigned mask = 1; mask != 1u << 4; mask <<= 1, cpu++)
-            if (v & mask)
-              aff.CpuSet(cpu);
-        }
-        if (!isError)
-        if (!aff.SetProcAffinity())
-        {
-          const DWORD lastError = GetLastError();
-          Parse1Log += " : ERROR : ";
-          Parse1Log += NError::MyFormatMessage(lastError);
-        }
-      }
-#endif // _WIN32
-
-      if (isError)
         throw CArcCmdLineException("Unsupported switch postfix -stm", s);
-
-      Parse1Log.Add_LF();
+      
+      #ifdef _WIN32
+      SetProcessAffinityMask(GetCurrentProcess(), v);
+      #endif
     }
   }
 
-#endif
+  #endif
 }
 
-
-
 struct CCodePagePair
 {
   const char *Name;
-  UInt32 CodePage;
+  Int32 CodePage;
 };
 
 static const unsigned kNumByteOnlyCodePages = 3;
@@ -1243,8 +941,8 @@ static const CCodePagePair g_CodePagePairs[] =
   { "utf-8", CP_UTF8 },
   { "win", CP_ACP },
   { "dos", CP_OEMCP },
-  { "utf-16le", Z7_WIN_CP_UTF16 },
-  { "utf-16be", Z7_WIN_CP_UTF16BE }
+  { "utf-16le", MY__CP_UTF16 },
+  { "utf-16be", MY__CP_UTF16BE }
 };
 
 static Int32 FindCharset(const NCommandLineParser::CParser &parser, unsigned keyIndex,
@@ -1259,14 +957,14 @@ static Int32 FindCharset(const NCommandLineParser::CParser &parser, unsigned key
     if (v < ((UInt32)1 << 16))
       return (Int32)v;
   name.MakeLower_Ascii();
-  const unsigned num = byteOnlyCodePages ? kNumByteOnlyCodePages : Z7_ARRAY_SIZE(g_CodePagePairs);
+  unsigned num = byteOnlyCodePages ? kNumByteOnlyCodePages : ARRAY_SIZE(g_CodePagePairs);
   for (unsigned i = 0;; i++)
   {
     if (i == num) // to disable warnings from different compilers
       throw CArcCmdLineException("Unsupported charset:", name);
     const CCodePagePair &pair = g_CodePagePairs[i];
     if (name.IsEqualTo(pair.Name))
-      return (Int32)pair.CodePage;
+      return pair.CodePage;
   }
 }
 
@@ -1278,40 +976,6 @@ static void SetBoolPair(NCommandLineParser::CParser &parser, unsigned switchID,
     bp.Val = !parser[switchID].WithMinus;
 }
 
-
-static bool ParseSizeString(const wchar_t *s, UInt64 &res)
-{
-  const wchar_t *end;
-  const UInt64 v = ConvertStringToUInt64(s, &end);
-  if (s == end)
-    return false;
-  const wchar_t c = *end;
-
-  if (c == 0)
-  {
-    res = v;
-    return true;
-  }
-  if (end[1] != 0)
-    return false;
-
-  unsigned numBits;
-  switch (MyCharLower_Ascii(c))
-  {
-    case 'b': numBits =  0; break;
-    case 'k': numBits = 10; break;
-    case 'm': numBits = 20; break;
-    case 'g': numBits = 30; break;
-    case 't': numBits = 40; break;
-    default: return false;
-  }
-  const UInt64 val2 = v << numBits;
-  if ((val2 >> numBits) != v)
-    return false;
-  res = val2;
-  return true;
-}
-
 void CArcCmdLineParser::Parse2(CArcCmdLineOptions &options)
 {
   const UStringVector &nonSwitchStrings = parser.NonSwitchStrings;
@@ -1324,34 +988,6 @@ void CArcCmdLineParser::Parse2(CArcCmdLineOptions &options)
 
   if (parser[NKey::kHash].ThereIs)
     options.HashMethods = parser[NKey::kHash].PostStrings;
-
-  /*
-  if (parser[NKey::kHashGenFile].ThereIs)
-  {
-    const UString &s = parser[NKey::kHashGenFile].PostStrings[0];
-    for (unsigned i = 0 ; i < s.Len();)
-    {
-      const wchar_t c = s[i++];
-      if (!options.HashOptions.ParseFlagCharOption(c, true))
-      {
-        if (c != '=')
-          throw CArcCmdLineException("Unsupported hash mode switch:", s);
-        options.HashOptions.HashFilePath = s.Ptr(i);
-        break;
-      }
-    }
-  }
-  */
-
-  if (parser[NKey::kHashDir].ThereIs)
-    options.ExtractOptions.HashDir = parser[NKey::kHashDir].PostStrings[0];
-  
-  if (parser[NKey::kExtractMemLimit].ThereIs)
-  {
-    const UString &s = parser[NKey::kExtractMemLimit].PostStrings[0];
-    if (!ParseSizeString(s, options.ExtractOptions.NtOptions.MemLimit))
-      throw CArcCmdLineException("Unsupported -smemx:", s);
-  }
   
   if (parser[NKey::kElimDup].ThereIs)
   {
@@ -1367,7 +1003,7 @@ void CArcCmdLineParser::Parse2(CArcCmdLineOptions &options)
     const UString &s = parser[NKey::kFullPathMode].PostStrings[0];
     if (!s.IsEmpty())
     {
-      if (s.IsEqualTo("2"))
+      if (s == L"2")
         censorPathMode = NWildcard::k_FullPath;
       else
         throw CArcCmdLineException("Unsupported -spf:", s);
@@ -1377,48 +1013,31 @@ void CArcCmdLineParser::Parse2(CArcCmdLineOptions &options)
   if (parser[NKey::kNameTrailReplace].ThereIs)
     g_PathTrailReplaceMode = !parser[NKey::kNameTrailReplace].WithMinus;
 
-  CNameOption nop;
-
+  NRecursedType::EEnum recursedType;
   if (parser[NKey::kRecursed].ThereIs)
-    nop.RecursedType = GetRecursedTypeFromIndex(parser[NKey::kRecursed].PostCharIndex);
+    recursedType = GetRecursedTypeFromIndex(parser[NKey::kRecursed].PostCharIndex);
+  else
+    recursedType = NRecursedType::kNonRecursed;
 
+  bool wildcardMatching = true;
   if (parser[NKey::kDisableWildcardParsing].ThereIs)
-    nop.WildcardMatching = false;
-
-  if (parser[NKey::kUseSlashMark].ThereIs)
-  {
-    const UString &s = parser[NKey::kUseSlashMark].PostStrings[0];
-    if (s.IsEmpty())
-      nop.MarkMode = NWildcard::kMark_StrictFile;
-    else if (s.IsEqualTo_Ascii_NoCase("-"))
-      nop.MarkMode = NWildcard::kMark_FileOrDir;
-    else if (s.IsEqualTo_Ascii_NoCase("2"))
-      nop.MarkMode = NWildcard::kMark_StrictFile_IfWildcard;
-    else
-      throw CArcCmdLineException("Unsupported -spm:", s);
-  }
+    wildcardMatching = false;
 
-
-  options.ConsoleCodePage = FindCharset(parser, NKey::kConsoleCharSet, true, -1);
-
-  const UInt32 codePage = (UInt32)FindCharset(parser, NKey::kListfileCharSet, false, CP_UTF8);
+  g_CodePage = FindCharset(parser, NKey::kConsoleCharSet, true, -1);
+  Int32 codePage = FindCharset(parser, NKey::kListfileCharSet, false, CP_UTF8);
 
   bool thereAreSwitchIncludes = false;
-
+  
   if (parser[NKey::kInclude].ThereIs)
   {
     thereAreSwitchIncludes = true;
-    nop.Include = true;
     AddSwitchWildcardsToCensor(options.Censor,
-        parser[NKey::kInclude].PostStrings, nop, codePage);
+        parser[NKey::kInclude].PostStrings, true, recursedType, wildcardMatching, codePage);
   }
 
   if (parser[NKey::kExclude].ThereIs)
-  {
-    nop.Include = false;
     AddSwitchWildcardsToCensor(options.Censor,
-        parser[NKey::kExclude].PostStrings, nop, codePage);
-  }
+        parser[NKey::kExclude].PostStrings, false, recursedType, wildcardMatching, codePage);
  
   unsigned curCommandIndex = kCommandIndex + 1;
   bool thereIsArchiveName = !parser[NKey::kNoArName].ThereIs &&
@@ -1426,10 +1045,9 @@ void CArcCmdLineParser::Parse2(CArcCmdLineOptions &options)
       options.Command.CommandType != NCommandType::kInfo &&
       options.Command.CommandType != NCommandType::kHash;
 
-  const bool isExtractGroupCommand = options.Command.IsFromExtractGroup();
-  const bool isExtractOrList = isExtractGroupCommand || options.Command.CommandType == NCommandType::kList;
-  const bool isRename = options.Command.CommandType == NCommandType::kRename;
-  options.UpdateOptions.RenameMode = isRename;
+  bool isExtractGroupCommand = options.Command.IsFromExtractGroup();
+  bool isExtractOrList = isExtractGroupCommand || options.Command.CommandType == NCommandType::kList;
+  bool isRename = options.Command.CommandType == NCommandType::kRename;
 
   if ((isExtractOrList || isRename) && options.StdInMode)
     thereIsArchiveName = false;
@@ -1449,14 +1067,16 @@ void CArcCmdLineParser::Parse2(CArcCmdLineOptions &options)
     #endif
   }
 
-  nop.Include = true;
   AddToCensorFromNonSwitchesStrings(isRename ? &options.UpdateOptions.RenamePairs : NULL,
       curCommandIndex, options.Censor,
       nonSwitchStrings, parser.StopSwitchIndex,
-      nop,
+      recursedType, wildcardMatching,
       thereAreSwitchIncludes, codePage);
 
-  #ifndef Z7_NO_CRYPTO
+  options.YesToAll = parser[NKey::kYes].ThereIs;
+
+
+  #ifndef _NO_CRYPTO
   options.PasswordEnabled = parser[NKey::kPassword].ThereIs;
   if (options.PasswordEnabled)
     options.Password = parser[NKey::kPassword].PostStrings[0];
@@ -1476,33 +1096,11 @@ void CArcCmdLineParser::Parse2(CArcCmdLineOptions &options)
   SetBoolPair(parser, NKey::kAltStreams, options.AltStreams);
   SetBoolPair(parser, NKey::kHardLinks, options.HardLinks);
   SetBoolPair(parser, NKey::kSymLinks, options.SymLinks);
-  
-  SetBoolPair(parser, NKey::kStoreOwnerId, options.StoreOwnerId);
-  SetBoolPair(parser, NKey::kStoreOwnerName, options.StoreOwnerName);
-  /*
-  bool supportSymLink = options.SymLinks.Val;
-  if (!options.SymLinks.Def)
-  {
-    if (isExtractOrList)
-      supportSymLink = true;
-    else
-      supportSymLink = false;
-  }
-  #ifdef ENV_HAVE_LSTAT
-  if (supportSymLink)
-    global_use_lstat = 1;
-  else
-    global_use_lstat = 0;
-  #endif
-  */
 
   if (isExtractOrList)
   {
     CExtractOptionsBase &eo = options.ExtractOptions;
 
-    eo.ExcludeDirItems = options.Censor.ExcludeDirItems;
-    eo.ExcludeFileItems = options.Censor.ExcludeFileItems;
-
     {
       CExtractNtOptions &nt = eo.NtOptions;
       nt.NtSecurity = options.NtSecurity;
@@ -1519,41 +1117,10 @@ void CArcCmdLineParser::Parse2(CArcCmdLineOptions &options)
       if (!options.SymLinks.Def)
         nt.SymLinks.Val = true;
 
-      if (parser[NKey::kSymLinks_AllowDangerous].ThereIs)
-      {
-        const UString &s = parser[NKey::kSymLinks_AllowDangerous].PostStrings[0];
-        UInt32 v = 9; // default value for "-snld" instead of default = 5 without "-snld".
-        if (!s.IsEmpty())
-          if (!StringToUInt32(s, v))
-            throw CArcCmdLineException("Unsupported switch postfix -snld", s);
-        nt.SymLinks_DangerousLevel = (unsigned)v;
-      }
-
       nt.ReplaceColonForAltStream = parser[NKey::kReplaceColonForAltStream].ThereIs;
       nt.WriteToAltStreamIfColon = parser[NKey::kWriteToAltStreamIfColon].ThereIs;
-
-      nt.ExtractOwner = options.StoreOwnerId.Val; // StoreOwnerName
-
-      if (parser[NKey::kPreserveATime].ThereIs)
-        nt.PreserveATime = true;
-      if (parser[NKey::kShareForWrite].ThereIs)
-        nt.OpenShareForWrite = true;
-    }
-
-    if (parser[NKey::kZoneFile].ThereIs)
-    {
-      eo.ZoneMode = NExtract::NZoneIdMode::kAll;
-      const UString &s = parser[NKey::kZoneFile].PostStrings[0];
-      if (!s.IsEmpty())
-      {
-             if (s.IsEqualTo("0")) eo.ZoneMode = NExtract::NZoneIdMode::kNone;
-        else if (s.IsEqualTo("1")) eo.ZoneMode = NExtract::NZoneIdMode::kAll;
-        else if (s.IsEqualTo("2")) eo.ZoneMode = NExtract::NZoneIdMode::kOffice;
-        else
-          throw CArcCmdLineException("Unsupported -snz:", s);
-      }
     }
-    
+      
     options.Censor.AddPathsToCensor(NWildcard::k_AbsPath);
     options.Censor.ExtendExclude();
 
@@ -1563,28 +1130,13 @@ void CArcCmdLineParser::Parse2(CArcCmdLineOptions &options)
 
     NWildcard::CCensor &arcCensor = options.arcCensor;
 
-    CNameOption nopArc;
-    // nopArc.RecursedType = NRecursedType::kNonRecursed; // default:  we don't want recursing for archives, if -r specified
-    // is it OK, external switches can disable WildcardMatching and MarcMode for arc.
-    nopArc.WildcardMatching = nop.WildcardMatching;
-    nopArc.MarkMode = nop.MarkMode;
-
     if (parser[NKey::kArInclude].ThereIs)
-    {
-      nopArc.Include = true;
-      AddSwitchWildcardsToCensor(arcCensor, parser[NKey::kArInclude].PostStrings, nopArc, codePage);
-    }
+      AddSwitchWildcardsToCensor(arcCensor, parser[NKey::kArInclude].PostStrings, true, NRecursedType::kNonRecursed, wildcardMatching, codePage);
     if (parser[NKey::kArExclude].ThereIs)
-    {
-      nopArc.Include = false;
-      AddSwitchWildcardsToCensor(arcCensor, parser[NKey::kArExclude].PostStrings, nopArc, codePage);
-    }
+      AddSwitchWildcardsToCensor(arcCensor, parser[NKey::kArExclude].PostStrings, false, NRecursedType::kNonRecursed, wildcardMatching, codePage);
 
     if (thereIsArchiveName)
-    {
-      nopArc.Include = true;
-      AddNameToCensor(arcCensor, nopArc, options.ArchiveName);
-    }
+      AddNameToCensor(arcCensor, options.ArchiveName, true, NRecursedType::kNonRecursed, wildcardMatching);
 
     arcCensor.AddPathsToCensor(NWildcard::k_RelatPath);
 
@@ -1622,9 +1174,6 @@ void CArcCmdLineParser::Parse2(CArcCmdLineOptions &options)
       if (parser[NKey::kOutputDir].ThereIs)
       {
         eo.OutputDir = us2fs(parser[NKey::kOutputDir].PostStrings[0]);
-        #ifdef _WIN32
-          NFile::NName::NormalizeDirSeparators(eo.OutputDir);
-        #endif
         NFile::NName::NormalizeDirPathPrefix(eo.OutputDir);
       }
 
@@ -1664,8 +1213,6 @@ void CArcCmdLineParser::Parse2(CArcCmdLineOptions &options)
     
     updateOptions.MethodMode.Properties = options.Properties;
 
-    if (parser[NKey::kPreserveATime].ThereIs)
-      updateOptions.PreserveATime = true;
     if (parser[NKey::kShareForWrite].ThereIs)
       updateOptions.OpenShareForWrite = true;
     if (parser[NKey::kStopAfterOpenError].ThereIs)
@@ -1677,9 +1224,6 @@ void CArcCmdLineParser::Parse2(CArcCmdLineOptions &options)
     updateOptions.NtSecurity = options.NtSecurity;
     updateOptions.HardLinks = options.HardLinks;
     updateOptions.SymLinks = options.SymLinks;
-    
-    updateOptions.StoreOwnerId = options.StoreOwnerId;
-    updateOptions.StoreOwnerName = options.StoreOwnerName;
 
     updateOptions.EMailMode = parser[NKey::kEmail].ThereIs;
     if (updateOptions.EMailMode)
@@ -1723,13 +1267,11 @@ void CArcCmdLineParser::Parse2(CArcCmdLineOptions &options)
   else if (options.Command.CommandType == NCommandType::kBenchmark)
   {
     options.NumIterations = 1;
-    options.NumIterations_Defined = false;
     if (curCommandIndex < numNonSwitchStrings)
     {
       if (!StringToUInt32(nonSwitchStrings[curCommandIndex], options.NumIterations))
-        throw CArcCmdLineException("Incorrect number of benchmark iterations", nonSwitchStrings[curCommandIndex]);
+        throw CArcCmdLineException("Incorrect Number of benmchmark iterations", nonSwitchStrings[curCommandIndex]);
       curCommandIndex++;
-      options.NumIterations_Defined = true;
     }
   }
   else if (options.Command.CommandType == NCommandType::kHash)
@@ -1740,14 +1282,10 @@ void CArcCmdLineParser::Parse2(CArcCmdLineOptions &options)
     CHashOptions &hashOptions = options.HashOptions;
     hashOptions.PathMode = censorPathMode;
     hashOptions.Methods = options.HashMethods;
-    // hashOptions.HashFilePath = options.HashFilePath;
-    if (parser[NKey::kPreserveATime].ThereIs)
-      hashOptions.PreserveATime = true;
     if (parser[NKey::kShareForWrite].ThereIs)
       hashOptions.OpenShareForWrite = true;
     hashOptions.StdInMode = options.StdInMode;
     hashOptions.AltStreamsMode = options.AltStreams.Val;
-    hashOptions.SymLinks = options.SymLinks;
   }
   else if (options.Command.CommandType == NCommandType::kInfo)
   {
@@ -1755,45 +1293,3 @@ void CArcCmdLineParser::Parse2(CArcCmdLineOptions &options)
   else
     throw 20150919;
 }
-
-
-
-#ifndef _WIN32
-
-static AString g_ModuleDirPrefix;
-
-void Set_ModuleDirPrefix_From_ProgArg0(const char *s);
-void Set_ModuleDirPrefix_From_ProgArg0(const char *s)
-{
-  AString a (s);
-  int sep = a.ReverseFind_PathSepar();
-  a.DeleteFrom((unsigned)(sep + 1));
-  g_ModuleDirPrefix = a;
-}
-
-namespace NWindows {
-namespace NDLL {
-
-FString GetModuleDirPrefix();
-FString GetModuleDirPrefix()
-{
-  FString s;
-
-  s = fas2fs(g_ModuleDirPrefix);
-  if (s.IsEmpty())
-    s = FTEXT(".") FSTRING_PATH_SEPARATOR;
-  return s;
-  /*
-  setenv("_7ZIP_HOME_DIR", "/test/", 0);
-  const char *home = getenv("_7ZIP_HOME_DIR");
-  if (home)
-    s = home;
-  else
-    s = FTEXT(".") FSTRING_PATH_SEPARATOR;
-  return s;
-  */
-}
-
-}}
-
-#endif // ! _WIN32