react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Console/List.cpp

@@ -124,15 +124,6 @@ static const char * const kPropIdToName[] =
   , "Read-only"
   , "Out Name"
   , "Copy Link"
-  , "ArcFileName"
-  , "IsHash"
-  , "Metadata Changed"
-  , "User ID"
-  , "Group ID"
-  , "Device Major"
-  , "Device Minor"
-  , "Dev Major"
-  , "Dev Minor"
 };
 
 static const char kEmptyAttribChar = '.';
@@ -240,13 +231,11 @@ static void PrintUString(EAdjustment adj, unsigned width, const UString &s, AStr
   {
     numSpaces = width - s.Len();
     unsigned numLeftSpaces = 0;
-    switch ((int)adj)
+    switch (adj)
     {
-      // case kLeft:   numLeftSpaces = 0; break;
+      case kLeft:   numLeftSpaces = 0; break;
       case kCenter: numLeftSpaces = numSpaces / 2; break;
       case kRight:  numLeftSpaces = numSpaces; break;
-      // case kLeft:
-      default: break;
     }
     PrintSpaces(numLeftSpaces);
     numSpaces -= numLeftSpaces;
@@ -265,13 +254,11 @@ static void PrintString(EAdjustment adj, unsigned width, const char *s)
   {
     numSpaces = width - len;
     unsigned numLeftSpaces = 0;
-    switch ((int)adj)
+    switch (adj)
     {
-      // case kLeft:   numLeftSpaces = 0; break;
+      case kLeft:   numLeftSpaces = 0; break;
       case kCenter: numLeftSpaces = numSpaces / 2; break;
       case kRight:  numLeftSpaces = numSpaces; break;
-      // case kLeft:
-      default: break;
     }
     PrintSpaces(numLeftSpaces);
     numSpaces -= numLeftSpaces;
@@ -290,13 +277,11 @@ static void PrintStringToString(char *dest, EAdjustment adj, unsigned width, con
   {
     numSpaces = width - len;
     unsigned numLeftSpaces = 0;
-    switch ((int)adj)
+    switch (adj)
     {
-      // case kLeft:   numLeftSpaces = 0; break;
+      case kLeft:   numLeftSpaces = 0; break;
       case kCenter: numLeftSpaces = numSpaces / 2; break;
       case kRight:  numLeftSpaces = numSpaces; break;
-      // case kLeft:
-      default: break;
     }
     PrintSpacesToString(dest, numLeftSpaces);
     dest += numLeftSpaces;
@@ -318,18 +303,22 @@ struct CListUInt64Def
   void Add(const CListUInt64Def &v) { if (v.Def) Add(v.Val); }
 };
 
-
-struct CListFileTimeDef: public CArcTime
+struct CListFileTimeDef
 {
+  FILETIME Val;
+  bool Def;
+
+  CListFileTimeDef(): Def(false) { Val.dwLowDateTime = 0; Val.dwHighDateTime = 0; }
   void Update(const CListFileTimeDef &t)
   {
-    if (t.Def && (!Def || CompareWith(t) < 0))
-      (*this) = t;
+    if (t.Def && (!Def || CompareFileTime(&Val, &t.Val) < 0))
+    {
+      Val = t.Val;
+      Def = true;
+    }
   }
 };
 
-
-
 struct CListStat
 {
   CListUInt64Def Size;
@@ -362,7 +351,7 @@ struct CListStat2
     AltStreams.Update(st.AltStreams);
     NumDirs += st.NumDirs;
   }
-  UInt64 GetNumStreams() const { return MainFiles.NumFiles + AltStreams.NumFiles; }
+  const UInt64 GetNumStreams() const { return MainFiles.NumFiles + AltStreams.NumFiles; }
   CListStat &GetStat(bool altStreamsMode) { return altStreamsMode ? AltStreams : MainFiles; }
 };
 
@@ -413,13 +402,13 @@ void CFieldPrinter::Init(const CFieldInfoInit *standardFieldTable, unsigned numI
     for (k = 0; k < fii.PrefixSpacesWidth; k++)
       LinesString.Add_Space();
     for (k = 0; k < fii.Width; k++)
-      LinesString.Add_Minus();
+      LinesString += '-';
   }
 }
 
 static void GetPropName(PROPID propID, const wchar_t *name, AString &nameA, UString &nameU)
 {
-  if (propID < Z7_ARRAY_SIZE(kPropIdToName))
+  if (propID < ARRAY_SIZE(kPropIdToName))
   {
     nameA = kPropIdToName[propID];
     return;
@@ -449,10 +438,10 @@ void CFieldPrinter::AddProp(const wchar_t *name, PROPID propID, bool isRawProp)
     unsigned i;
     for (i = 0; i < s.Len(); i++)
     {
-      const wchar_t c = s[i];
+      wchar_t c = s[i];
       if (c >= 0x80)
         break;
-      sA.Add_Char((char)c);
+      sA += (char)c;
     }
     if (i == s.Len())
       f.NameA = sA;
@@ -463,13 +452,13 @@ void CFieldPrinter::AddProp(const wchar_t *name, PROPID propID, bool isRawProp)
 HRESULT CFieldPrinter::AddMainProps(IInArchive *archive)
 {
   UInt32 numProps;
-  RINOK(archive->GetNumberOfProperties(&numProps))
+  RINOK(archive->GetNumberOfProperties(&numProps));
   for (UInt32 i = 0; i < numProps; i++)
   {
     CMyComBSTR name;
     PROPID propID;
     VARTYPE vt;
-    RINOK(archive->GetPropertyInfo(i, &name, &propID, &vt))
+    RINOK(archive->GetPropertyInfo(i, &name, &propID, &vt));
     AddProp(name, propID, false);
   }
   return S_OK;
@@ -478,12 +467,12 @@ HRESULT CFieldPrinter::AddMainProps(IInArchive *archive)
 HRESULT CFieldPrinter::AddRawProps(IArchiveGetRawProps *getRawProps)
 {
   UInt32 numProps;
-  RINOK(getRawProps->GetNumRawProps(&numProps))
+  RINOK(getRawProps->GetNumRawProps(&numProps));
   for (UInt32 i = 0; i < numProps; i++)
   {
     CMyComBSTR name;
     PROPID propID;
-    RINOK(getRawProps->GetRawPropInfo(i, &name, &propID))
+    RINOK(getRawProps->GetRawPropInfo(i, &name, &propID));
     AddProp(name, propID, true);
   }
   return S_OK;
@@ -504,47 +493,37 @@ void CFieldPrinter::PrintTitleLines()
   g_StdOut << LinesString;
 }
 
-static void PrintTime(char *dest, const CListFileTimeDef &t, bool showNS)
+static void PrintTime(char *dest, const FILETIME *ft)
 {
   *dest = 0;
-  if (t.IsZero())
+  if (ft->dwLowDateTime == 0 && ft->dwHighDateTime == 0)
     return;
-  int prec = kTimestampPrintLevel_SEC;
-  unsigned flags = 0;
-  if (showNS) // techmode
-  {
-    prec = kTimestampPrintLevel_NTFS;
-    if (t.Prec != 0)
-    {
-      prec = t.GetNumDigits();
-      if (prec < kTimestampPrintLevel_DAY)
-        prec = kTimestampPrintLevel_NTFS;
-    }
-  }
-  else
-  {
-    // we want same default number of characters, so we disable 'Z' marker:
-    flags = kTimestampPrintFlags_DisableZ;
-  }
+  ConvertUtcFileTimeToString(*ft, dest, kTimestampPrintLevel_SEC);
+}
 
-  ConvertUtcFileTimeToString2(t.FT, t.Ns100, dest, prec, flags);
+#ifndef _SFX
+
+static inline char GetHex(Byte value)
+{
+  return (char)((value < 10) ? ('0' + value) : ('A' + (value - 10)));
 }
 
-#ifndef Z7_SFX
+static void HexToString(char *dest, const Byte *data, UInt32 size)
+{
+  for (UInt32 i = 0; i < size; i++)
+  {
+    Byte b = data[i];
+    dest[0] = GetHex((Byte)((b >> 4) & 0xF));
+    dest[1] = GetHex((Byte)(b & 0xF));
+    dest += 2;
+  }
+  *dest = 0;
+}
 
 #endif
 
 #define MY_ENDL endl
 
-inline bool IsPropId_for_PathString(UInt32 propId)
-{
-  return (propId == kpidPath
-    // || propId == kpidName
-    || propId == kpidSymLink
-    || propId == kpidHardLink
-    || propId == kpidCopyLink);
-}
-
 HRESULT CFieldPrinter::PrintItemInfo(UInt32 index, const CListStat &st)
 {
   char temp[128];
@@ -581,7 +560,7 @@ HRESULT CFieldPrinter::PrintItemInfo(UInt32 index, const CListStat &st)
     {
       if (!techMode)
         g_StdOut << temp;
-      g_StdOut.NormalizePrint_UString_Path(FilePath, TempWString, TempAString);
+      g_StdOut.NormalizePrint_UString(FilePath, TempWString, TempAString);
       if (techMode)
         g_StdOut << MY_ENDL;
       continue;
@@ -591,12 +570,12 @@ HRESULT CFieldPrinter::PrintItemInfo(UInt32 index, const CListStat &st)
     
     if (f.IsRawProp)
     {
-      #ifndef Z7_SFX
+      #ifndef _SFX
       
       const void *data;
       UInt32 dataSize;
       UInt32 propType;
-      RINOK(Arc->GetRawProps->GetRawProp(index, f.PropID, &data, &dataSize, &propType))
+      RINOK(Arc->GetRawProps->GetRawProp(index, f.PropID, &data, &dataSize, &propType));
       
       if (dataSize != 0)
       {
@@ -606,7 +585,7 @@ HRESULT CFieldPrinter::PrintItemInfo(UInt32 index, const CListStat &st)
         {
           if (propType != NPropDataType::kRaw)
             return E_FAIL;
-          #ifndef Z7_SFX
+          #ifndef _SFX
           ConvertNtSecureToString((const Byte *)data, dataSize, TempAString);
           g_StdOut << TempAString;
           needPrint = false;
@@ -637,7 +616,7 @@ HRESULT CFieldPrinter::PrintItemInfo(UInt32 index, const CListStat &st)
           else
           {
             char hexStr[kMaxDataSize * 2 + 4];
-            ConvertDataToHex_Lower(hexStr, (const Byte *)data, dataSize);
+            HexToString(hexStr, (const Byte *)data, dataSize);
             g_StdOut << hexStr;
           }
         }
@@ -652,15 +631,9 @@ HRESULT CFieldPrinter::PrintItemInfo(UInt32 index, const CListStat &st)
       {
         case kpidSize: if (st.Size.Def) prop = st.Size.Val; break;
         case kpidPackSize: if (st.PackSize.Def) prop = st.PackSize.Val; break;
-        case kpidMTime:
-        {
-          const CListFileTimeDef &mtime = st.MTime;
-          if (mtime.Def)
-            prop.SetAsTimeFrom_FT_Prec_Ns100(mtime.FT, mtime.Prec, mtime.Ns100);
-          break;
-        }
+        case kpidMTime: if (st.MTime.Def) prop = st.MTime.Val; break;
         default:
-          RINOK(Arc->Archive->GetProperty(index, f.PropID, &prop))
+          RINOK(Arc->Archive->GetProperty(index, f.PropID, &prop));
       }
       if (f.PropID == kpidAttrib && (prop.vt == VT_EMPTY || prop.vt == VT_UI4))
       {
@@ -680,9 +653,7 @@ HRESULT CFieldPrinter::PrintItemInfo(UInt32 index, const CListStat &st)
       }
       else if (prop.vt == VT_FILETIME)
       {
-        CListFileTimeDef t;
-        t.Set_From_Prop(prop);
-        PrintTime(temp + tempPos, t, techMode);
+        PrintTime(temp + tempPos, &prop.filetime);
         if (techMode)
           g_StdOut << temp + tempPos;
         else
@@ -701,12 +672,11 @@ HRESULT CFieldPrinter::PrintItemInfo(UInt32 index, const CListStat &st)
       {
         TempWString.SetFromBstr(prop.bstrVal);
         // do we need multi-line support here ?
-        if (IsPropId_for_PathString(f.PropID))
-          g_StdOut.Normalize_UString_Path(TempWString);
-        else
-          g_StdOut.Normalize_UString(TempWString);
+        g_StdOut.Normalize_UString(TempWString);
         if (techMode)
+        {
           g_StdOut.PrintUString(TempWString, TempAString);
+        }
         else
           PrintUString(f.TextAdjustment, width, TempWString, TempAString);
       }
@@ -756,7 +726,7 @@ void CFieldPrinter::PrintSum(const CListStat &st, UInt64 numDirs, const char *st
       char s[64];
       s[0] = 0;
       if (st.MTime.Def)
-        PrintTime(s, st.MTime, false); // showNS
+        PrintTime(s, &st.MTime.Val);
       PrintString(f.TextAdjustment, f.Width, s);
     }
     else if (f.PropID == kpidPath)
@@ -781,7 +751,7 @@ void CFieldPrinter::PrintSum(const CListStat2 &stat2)
   PrintSum(stat2.MainFiles, stat2.NumDirs, kString_Files);
   if (stat2.AltStreams.NumFiles != 0)
   {
-    PrintSum(stat2.AltStreams, 0, kString_AltStreams);
+    PrintSum(stat2.AltStreams, 0, kString_AltStreams);;
     CListStat st = stat2.MainFiles;
     st.Update(stat2.AltStreams);
     PrintSum(st, 0, kString_Streams);
@@ -793,21 +763,23 @@ static HRESULT GetUInt64Value(IInArchive *archive, UInt32 index, PROPID propID,
   value.Val = 0;
   value.Def = false;
   CPropVariant prop;
-  RINOK(archive->GetProperty(index, propID, &prop))
+  RINOK(archive->GetProperty(index, propID, &prop));
   value.Def = ConvertPropVariantToUInt64(prop, value.Val);
   return S_OK;
 }
 
 static HRESULT GetItemMTime(IInArchive *archive, UInt32 index, CListFileTimeDef &t)
 {
-  /* maybe we could call CArc::GetItemMTime(UInt32 index, CArcTime &ft, bool &defined) here
-     that can set default timestamp, if not defined */
-  t.Clear();
-  // t.Def = false;
+  t.Val.dwLowDateTime = 0;
+  t.Val.dwHighDateTime = 0;
+  t.Def = false;
   CPropVariant prop;
-  RINOK(archive->GetProperty(index, kpidMTime, &prop))
+  RINOK(archive->GetProperty(index, kpidMTime, &prop));
   if (prop.vt == VT_FILETIME)
-    t.Set_From_Prop(prop);
+  {
+    t.Val = prop.filetime;
+    t.Def = true;
+  }
   else if (prop.vt != VT_EMPTY)
     return E_FAIL;
   return S_OK;
@@ -822,7 +794,7 @@ static void PrintPropName_and_Eq(CStdOutStream &so, PROPID propID)
 {
   const char *s;
   char temp[16];
-  if (propID < Z7_ARRAY_SIZE(kPropIdToName))
+  if (propID < ARRAY_SIZE(kPropIdToName))
     s = kPropIdToName[propID];
   else
   {
@@ -862,46 +834,34 @@ static void UString_Replace_CRLF_to_LF(UString &s)
     }
     *dest++ = c;
   }
-  s.ReleaseBuf_SetEnd((unsigned)(size_t)(dest - s.GetBuf()));
+  s.ReleaseBuf_SetEnd((unsigned)(dest - s.GetBuf()));
 }
 
+
 static void PrintPropVal_MultiLine(CStdOutStream &so, const wchar_t *val)
 {
-  UString s (val);
+  UString s = val;
   if (s.Find(L'\n') >= 0)
   {
     so << endl;
     so << "{";
     so << endl;
     UString_Replace_CRLF_to_LF(s);
-    UString temp;
-    unsigned start = 0;
-    for (;;)
-    {
-      unsigned size = s.Len() - start;
-      if (size == 0)
-        break;
-      const int next = s.Find(L'\n', start);
-      if (next >= 0)
-        size = (unsigned)next - start;
-      temp.SetFrom(s.Ptr() + start, size);
-      so.NormalizePrint_UString(temp);
-      so << endl;
-      if (next < 0)
-        break;
-      start = (unsigned)next + 1;
-    }
+    so.Normalize_UString__LF_Allowed(s);
+    so << s;
+    so << endl;
     so << "}";
   }
   else
   {
-    so.NormalizePrint_UString(s);
+    so.Normalize_UString(s);
+    so << s;
   }
   so << endl;
 }
 
 
-static void PrintPropPair(CStdOutStream &so, const char *name, const wchar_t *val, bool multiLine, bool isPath = false)
+static void PrintPropPair(CStdOutStream &so, const char *name, const wchar_t *val, bool multiLine)
 {
   so << name << " = ";
   if (multiLine)
@@ -909,28 +869,17 @@ static void PrintPropPair(CStdOutStream &so, const char *name, const wchar_t *va
     PrintPropVal_MultiLine(so, val);
     return;
   }
-  UString s (val);
-  if (isPath)
-    so.Normalize_UString_Path(s);
-  else
-    so.Normalize_UString(s);
+  UString s = val;
+  so.Normalize_UString(s);
   so << s;
   so << endl;
 }
 
 
-static void PrintPropPair_Path(CStdOutStream &so, const wchar_t *path)
-{
-  PrintPropPair(so, "Path", path,
-        false, // multiLine
-        true); // isPath
-}
-
 static void PrintPropertyPair2(CStdOutStream &so, PROPID propID, const wchar_t *name, const CPropVariant &prop)
 {
   UString s;
-  const int levelTopLimit = 9; // 1ns level
-  ConvertPropertyToString2(s, prop, propID, levelTopLimit);
+  ConvertPropertyToString2(s, prop, propID);
   if (!s.IsEmpty())
   {
     AString nameA;
@@ -948,7 +897,7 @@ static void PrintPropertyPair2(CStdOutStream &so, PROPID propID, const wchar_t *
 static HRESULT PrintArcProp(CStdOutStream &so, IInArchive *archive, PROPID propID, const wchar_t *name)
 {
   CPropVariant prop;
-  RINOK(archive->GetArchiveProperty(propID, &prop))
+  RINOK(archive->GetArchiveProperty(propID, &prop));
   PrintPropertyPair2(so, propID, name, prop);
   return S_OK;
 }
@@ -956,7 +905,7 @@ static HRESULT PrintArcProp(CStdOutStream &so, IInArchive *archive, PROPID propI
 static void PrintArcTypeError(CStdOutStream &so, const UString &type, bool isWarning)
 {
   so << "Open " << (isWarning ? "WARNING" : "ERROR")
-    << ": Cannot open the file as ["
+    << ": Can not open the file as ["
     << type
     << "] archive"
     << endl;
@@ -977,7 +926,6 @@ static void ErrorInfo_Print(CStdOutStream &so, const CArcErrorInfo &er)
     PrintPropPair(so, "WARNING", er.WarningMessage, true);
 }
 
-HRESULT Print_OpenArchive_Props(CStdOutStream &so, const CCodecs *codecs, const CArchiveLink &arcLink);
 HRESULT Print_OpenArchive_Props(CStdOutStream &so, const CCodecs *codecs, const CArchiveLink &arcLink)
 {
   FOR_VECTOR (r, arcLink.Arcs)
@@ -986,7 +934,7 @@ HRESULT Print_OpenArchive_Props(CStdOutStream &so, const CCodecs *codecs, const
     const CArcErrorInfo &er = arc.ErrorInfo;
     
     so << "--\n";
-    PrintPropPair_Path(so, arc.Path);
+    PrintPropPair(so, "Path", arc.Path, false);
     if (er.ErrorFormatIndex >= 0)
     {
       if (er.ErrorFormatIndex == arc.FormatIndex)
@@ -1002,20 +950,20 @@ HRESULT Print_OpenArchive_Props(CStdOutStream &so, const CCodecs *codecs, const
     if (offset != 0)
       PrintPropNameAndNumber_Signed(so, kpidOffset, offset);
     IInArchive *archive = arc.Archive;
-    RINOK(PrintArcProp(so, archive, kpidPhySize, NULL))
+    RINOK(PrintArcProp(so, archive, kpidPhySize, NULL));
     if (er.TailSize != 0)
       PrintPropNameAndNumber(so, kpidTailSize, er.TailSize);
     {
       UInt32 numProps;
-      RINOK(archive->GetNumberOfArchiveProperties(&numProps))
+      RINOK(archive->GetNumberOfArchiveProperties(&numProps));
       
       for (UInt32 j = 0; j < numProps; j++)
       {
         CMyComBSTR name;
         PROPID propID;
         VARTYPE vt;
-        RINOK(archive->GetArchivePropertyInfo(j, &name, &propID, &vt))
-        RINOK(PrintArcProp(so, archive, propID, name))
+        RINOK(archive->GetArchivePropertyInfo(j, &name, &propID, &vt));
+        RINOK(PrintArcProp(so, archive, propID, name));
       }
     }
     
@@ -1031,9 +979,9 @@ HRESULT Print_OpenArchive_Props(CStdOutStream &so, const CCodecs *codecs, const
           CMyComBSTR name;
           PROPID propID;
           VARTYPE vt;
-          RINOK(archive->GetPropertyInfo(j, &name, &propID, &vt))
+          RINOK(archive->GetPropertyInfo(j, &name, &propID, &vt));
           CPropVariant prop;
-          RINOK(archive->GetProperty(mainIndex, propID, &prop))
+          RINOK(archive->GetProperty(mainIndex, propID, &prop));
           PrintPropertyPair2(so, propID, name, prop);
         }
       }
@@ -1042,23 +990,22 @@ HRESULT Print_OpenArchive_Props(CStdOutStream &so, const CCodecs *codecs, const
   return S_OK;
 }
 
-HRESULT Print_OpenArchive_Error(CStdOutStream &so, const CCodecs *codecs, const CArchiveLink &arcLink);
 HRESULT Print_OpenArchive_Error(CStdOutStream &so, const CCodecs *codecs, const CArchiveLink &arcLink)
 {
-  #ifndef Z7_NO_CRYPTO
+  #ifndef _NO_CRYPTO
   if (arcLink.PasswordWasAsked)
-    so << "Cannot open encrypted archive. Wrong password?";
+    so << "Can not open encrypted archive. Wrong password?";
   else
   #endif
   {
     if (arcLink.NonOpen_ErrorInfo.ErrorFormatIndex >= 0)
     {
-      so.NormalizePrint_UString_Path(arcLink.NonOpen_ArcPath);
+      so.NormalizePrint_UString(arcLink.NonOpen_ArcPath);
       so << endl;
-      PrintArcTypeError(so, codecs->Formats[(unsigned)arcLink.NonOpen_ErrorInfo.ErrorFormatIndex].Name, false);
+      PrintArcTypeError(so, codecs->Formats[arcLink.NonOpen_ErrorInfo.ErrorFormatIndex].Name, false);
     }
     else
-      so << "Cannot open the file as archive";
+      so << "Can not open the file as archive";
   }
 
   so << endl;
@@ -1070,9 +1017,7 @@ HRESULT Print_OpenArchive_Error(CStdOutStream &so, const CCodecs *codecs, const
 
 bool CensorNode_CheckPath(const NWildcard::CCensorNode &node, const CReadArcItem &item);
 
-HRESULT ListArchives(
-    const CListOptions &listOptions,
-    CCodecs *codecs,
+HRESULT ListArchives(CCodecs *codecs,
     const CObjectVector<COpenType> &types,
     const CIntVector &excludedFormats,
     bool stdInMode,
@@ -1080,10 +1025,10 @@ HRESULT ListArchives(
     bool processAltStreams, bool showAltStreams,
     const NWildcard::CCensorNode &wildcardCensor,
     bool enableHeaders, bool techMode,
-    #ifndef Z7_NO_CRYPTO
+    #ifndef _NO_CRYPTO
     bool &passwordEnabled, UString &password,
     #endif
-    #ifndef Z7_SFX
+    #ifndef _SFX
     const CObjectVector<CProperty> *props,
     #endif
     UInt64 &numErrors,
@@ -1096,7 +1041,7 @@ HRESULT ListArchives(
 
   CFieldPrinter fp;
   if (!techMode)
-    fp.Init(kStandardFieldTable, Z7_ARRAY_SIZE(kStandardFieldTable));
+    fp.Init(kStandardFieldTable, ARRAY_SIZE(kStandardFieldTable));
 
   CListStat2 stat2total;
   
@@ -1120,17 +1065,17 @@ HRESULT ListArchives(
     if (!stdInMode)
     {
       NFile::NFind::CFileInfo fi;
-      if (!fi.Find_FollowLink(us2fs(arcPath)))
+      if (!fi.Find(us2fs(arcPath)))
       {
         DWORD errorCode = GetLastError();
         if (errorCode == 0)
           errorCode = ERROR_FILE_NOT_FOUND;
-        lastError = HRESULT_FROM_WIN32(errorCode);
+        lastError = HRESULT_FROM_WIN32(lastError);;
         g_StdOut.Flush();
         if (g_ErrStream)
         {
           *g_ErrStream << endl << kError << NError::MyFormatMessage(errorCode) << endl;
-          g_ErrStream->NormalizePrint_UString_Path(arcPath);
+          g_ErrStream->NormalizePrint_UString(arcPath);
           *g_ErrStream << endl << endl;
         }
         numErrors++;
@@ -1142,7 +1087,7 @@ HRESULT ListArchives(
         if (g_ErrStream)
         {
           *g_ErrStream << endl << kError;
-          g_ErrStream->NormalizePrint_UString_Path(arcPath);
+          g_ErrStream->NormalizePrint_UString(arcPath);
           *g_ErrStream << " is not a file" << endl << endl;
         }
         numErrors++;
@@ -1155,9 +1100,9 @@ HRESULT ListArchives(
     CArchiveLink arcLink;
 
     COpenCallbackConsole openCallback;
-    openCallback.Init(&g_StdOut, g_ErrStream, NULL, listOptions.DisablePercents);
+    openCallback.Init(&g_StdOut, g_ErrStream, NULL);
 
-    #ifndef Z7_NO_CRYPTO
+    #ifndef _NO_CRYPTO
 
     openCallback.PasswordIsDefined = passwordEnabled;
     openCallback.Password = password;
@@ -1171,7 +1116,7 @@ HRESULT ListArchives(
     */
     
     COpenOptions options;
-    #ifndef Z7_SFX
+    #ifndef _SFX
     options.props = props;
     #endif
     options.codecs = codecs;
@@ -1184,7 +1129,7 @@ HRESULT ListArchives(
     if (enableHeaders)
     {
       g_StdOut << endl << kListing;
-      g_StdOut.NormalizePrint_UString_Path(arcPath);
+      g_StdOut.NormalizePrint_UString(arcPath);
       g_StdOut << endl << endl;
     }
     
@@ -1200,7 +1145,7 @@ HRESULT ListArchives(
       if (g_ErrStream)
       {
         *g_ErrStream << endl << kError;
-        g_ErrStream->NormalizePrint_UString_Path(arcPath);
+        g_ErrStream->NormalizePrint_UString(arcPath);
         *g_ErrStream << " : ";
         if (result == S_FALSE)
         {
@@ -1258,7 +1203,7 @@ HRESULT ListArchives(
 
     if (enableHeaders)
     {
-      RINOK(Print_OpenArchive_Props(g_StdOut, codecs, arcLink))
+      RINOK(Print_OpenArchive_Props(g_StdOut, codecs, arcLink));
 
       g_StdOut << endl;
       if (techMode)
@@ -1280,17 +1225,17 @@ HRESULT ListArchives(
     if (techMode)
     {
       fp.Clear();
-      RINOK(fp.AddMainProps(archive))
+      RINOK(fp.AddMainProps(archive));
       if (arc.GetRawProps)
       {
-        RINOK(fp.AddRawProps(arc.GetRawProps))
+        RINOK(fp.AddRawProps(arc.GetRawProps));
       }
     }
     
     CListStat2 stat2;
     
     UInt32 numItems;
-    RINOK(archive->GetNumberOfItems(&numItems))
+    RINOK(archive->GetNumberOfItems(&numItems));
  
     CReadArcItem item;
     UStringVector pathParts;
@@ -1300,16 +1245,16 @@ HRESULT ListArchives(
       if (NConsoleClose::TestBreakSignal())
         return E_ABORT;
 
-      HRESULT res = arc.GetItem_Path2(i, fp.FilePath);
+      HRESULT res = arc.GetItemPath2(i, fp.FilePath);
 
       if (stdInMode && res == E_INVALIDARG)
         break;
-      RINOK(res)
+      RINOK(res);
 
       if (arc.Ask_Aux)
       {
         bool isAux;
-        RINOK(Archive_IsItem_Aux(archive, i, isAux))
+        RINOK(Archive_IsItem_Aux(archive, i, isAux));
         if (isAux)
           continue;
       }
@@ -1317,27 +1262,24 @@ HRESULT ListArchives(
       bool isAltStream = false;
       if (arc.Ask_AltStream)
       {
-        RINOK(Archive_IsItem_AltStream(archive, i, isAltStream))
+        RINOK(Archive_IsItem_AltStream(archive, i, isAltStream));
         if (isAltStream && !processAltStreams)
           continue;
       }
 
-      RINOK(Archive_IsItem_Dir(archive, i, fp.IsDir))
-
-      if (fp.IsDir ? listOptions.ExcludeDirItems : listOptions.ExcludeFileItems)
-        continue;
+      RINOK(Archive_IsItem_Dir(archive, i, fp.IsDir));
 
       if (!allFilesAreAllowed)
       {
         if (isAltStream)
         {
-          RINOK(arc.GetItem(i, item))
+          RINOK(arc.GetItem(i, item));
           if (!CensorNode_CheckPath(wildcardCensor, item))
             continue;
         }
         else
         {
-          SplitPathToParts(fp.FilePath, pathParts);
+          SplitPathToParts(fp.FilePath, pathParts);;
           bool include;
           if (!wildcardCensor.CheckPathVect(pathParts, !fp.IsDir, include))
             continue;
@@ -1348,9 +1290,9 @@ HRESULT ListArchives(
       
       CListStat st;
       
-      RINOK(GetUInt64Value(archive, i, kpidSize, st.Size))
-      RINOK(GetUInt64Value(archive, i, kpidPackSize, st.PackSize))
-      RINOK(GetItemMTime(archive, i, st.MTime))
+      RINOK(GetUInt64Value(archive, i, kpidSize, st.Size));
+      RINOK(GetUInt64Value(archive, i, kpidPackSize, st.PackSize));
+      RINOK(GetItemMTime(archive, i, st.MTime));
 
       if (fp.IsDir)
         stat2.NumDirs++;
@@ -1360,7 +1302,7 @@ HRESULT ListArchives(
 
       if (isAltStream && !showAltStreams)
         continue;
-      RINOK(fp.PrintItemInfo(i, st))
+      RINOK(fp.PrintItemInfo(i, st));
     }
 
     UInt64 numStreams = stat2.GetNumStreams();
@@ -1388,8 +1330,8 @@ HRESULT ListArchives(
       if (arcLink.NonOpen_ErrorInfo.ErrorFormatIndex >= 0)
       {
         g_StdOut << "----------\n";
-        PrintPropPair_Path(g_StdOut, arcLink.NonOpen_ArcPath);
-        PrintArcTypeError(g_StdOut, codecs->Formats[(unsigned)arcLink.NonOpen_ErrorInfo.ErrorFormatIndex].Name, false);
+        PrintPropPair(g_StdOut, "Path", arcLink.NonOpen_ArcPath, false);
+        PrintArcTypeError(g_StdOut, codecs->Formats[arcLink.NonOpen_ErrorInfo.ErrorFormatIndex].Name, false);
       }
     }