react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/CPP/Common/Wildcard.cpp

@@ -4,17 +4,9 @@
 
 #include "Wildcard.h"
 
-extern
-bool g_CaseSensitive;
 bool g_CaseSensitive =
   #ifdef _WIN32
     false;
-  #elif defined (__APPLE__)
-    #ifdef TARGET_OS_IPHONE
-      true;
-    #else
-      false;
-    #endif
   #else
     true;
   #endif
@@ -27,84 +19,11 @@ bool IsPath1PrefixedByPath2(const wchar_t *s1, const wchar_t *s2)
   return IsString1PrefixedByString2_NoCase(s1, s2);
 }
 
-// #include <stdio.h>
-
-/*
-static int MyStringCompare_PathLinux(const wchar_t *s1, const wchar_t *s2) throw()
-{
-  for (;;)
-  {
-    wchar_t c1 = *s1++;
-    wchar_t c2 = *s2++;
-    if (c1 != c2)
-    {
-      if (c1 == 0) return -1;
-      if (c2 == 0) return 1;
-      if (c1 == '/') c1 = 0;
-      if (c2 == '/') c2 = 0;
-      if (c1 < c2) return -1;
-      if (c1 > c2) return 1;
-      continue;
-    }
-    if (c1 == 0) return 0;
-  }
-}
-*/
-
-static int MyStringCompare_Path(const wchar_t *s1, const wchar_t *s2) throw()
-{
-  for (;;)
-  {
-    wchar_t c1 = *s1++;
-    wchar_t c2 = *s2++;
-    if (c1 != c2)
-    {
-      if (c1 == 0) return -1;
-      if (c2 == 0) return 1;
-      if (IS_PATH_SEPAR(c1)) c1 = 0;
-      if (IS_PATH_SEPAR(c2)) c2 = 0;
-      if (c1 < c2) return -1;
-      if (c1 > c2) return 1;
-      continue;
-    }
-    if (c1 == 0) return 0;
-  }
-}
-
-static int MyStringCompareNoCase_Path(const wchar_t *s1, const wchar_t *s2) throw()
-{
-  for (;;)
-  {
-    wchar_t c1 = *s1++;
-    wchar_t c2 = *s2++;
-    if (c1 != c2)
-    {
-      if (c1 == 0) return -1;
-      if (c2 == 0) return 1;
-      if (IS_PATH_SEPAR(c1)) c1 = 0;
-      if (IS_PATH_SEPAR(c2)) c2 = 0;
-      c1 = MyCharUpper(c1);
-      c2 = MyCharUpper(c2);
-      if (c1 < c2) return -1;
-      if (c1 > c2) return 1;
-      continue;
-    }
-    if (c1 == 0) return 0;
-  }
-}
-
 int CompareFileNames(const wchar_t *s1, const wchar_t *s2) STRING_UNICODE_THROW
 {
-  /*
-  printf("\nCompareFileNames");
-  printf("\n S1: %ls", s1);
-  printf("\n S2: %ls", s2);
-  printf("\n");
-  */
-  // 21.07 : we parse PATH_SEPARATOR so: 0 < PATH_SEPARATOR < 1
   if (g_CaseSensitive)
-    return MyStringCompare_Path(s1, s2);
-  return MyStringCompareNoCase_Path(s1, s2);
+    return MyStringCompare(s1, s2);
+  return MyStringCompareNoCase(s1, s2);
 }
 
 #ifndef USE_UNICODE_FSTRING
@@ -112,7 +31,9 @@ int CompareFileNames(const char *s1, const char *s2)
 {
   const UString u1 = fs2us(s1);
   const UString u2 = fs2us(s2);
-  return CompareFileNames(u1, u2);
+  if (g_CaseSensitive)
+    return MyStringCompare(u1, u2);
+  return MyStringCompareNoCase(u1, u2);
 }
 #endif
 
@@ -125,8 +46,8 @@ static bool EnhancedMaskTest(const wchar_t *mask, const wchar_t *name)
 {
   for (;;)
   {
-    const wchar_t m = *mask;
-    const wchar_t c = *name;
+    wchar_t m = *mask;
+    wchar_t c = *name;
     if (m == 0)
       return (c == 0);
     if (m == '*')
@@ -210,7 +131,7 @@ UString ExtractDirPrefixFromPath(const UString &path)
 
 UString ExtractFileNameFromPath(const UString &path)
 {
-  return UString(path.Ptr((unsigned)(path.ReverseFind_PathSepar() + 1)));
+  return UString(path.Ptr(path.ReverseFind_PathSepar() + 1));
 }
 
 
@@ -255,8 +176,7 @@ ForDir   nonrec         [0, M)                   same as ForBoth-File
 
 bool CItem::AreAllAllowed() const
 {
-  return ForFile && ForDir && WildcardMatching
-      && PathParts.Size() == 1 && PathParts.Front().IsEqualTo("*");
+  return ForFile && ForDir && WildcardMatching && PathParts.Size() == 1 && PathParts.Front() == L"*";
 }
 
 bool CItem::CheckPath(const UStringVector &pathParts, bool isFile) const
@@ -309,12 +229,12 @@ bool CItem::CheckPath(const UStringVector &pathParts, bool isFile) const
     {
       if (WildcardMatching)
       {
-        if (!DoesWildcardMatchName(PathParts[i], pathParts[i + (unsigned)d]))
+        if (!DoesWildcardMatchName(PathParts[i], pathParts[i + d]))
           break;
       }
       else
       {
-        if (CompareFileNames(PathParts[i], pathParts[i + (unsigned)d]) != 0)
+        if (CompareFileNames(PathParts[i], pathParts[i + d]) != 0)
           break;
       }
     }
@@ -338,14 +258,16 @@ int CCensorNode::FindSubNode(const UString &name) const
 {
   FOR_VECTOR (i, SubNodes)
     if (CompareFileNames(SubNodes[i].Name, name) == 0)
-      return (int)i;
+      return i;
   return -1;
 }
 
 void CCensorNode::AddItemSimple(bool include, CItem &item)
 {
-  CObjectVector<CItem> &items = include ? IncludeItems : ExcludeItems;
-  items.Add(item);
+  if (include)
+    IncludeItems.Add(item);
+  else
+    ExcludeItems.Add(item);
 }
 
 void CCensorNode::AddItem(bool include, CItem &item, int ignoreWildcardIndex)
@@ -360,7 +282,6 @@ void CCensorNode::AddItem(bool include, CItem &item, int ignoreWildcardIndex)
     AddItemSimple(include, item);
     return;
   }
-
   const UString &front = item.PathParts.Front();
   
   // WIN32 doesn't support wildcards in file names
@@ -371,23 +292,23 @@ void CCensorNode::AddItem(bool include, CItem &item, int ignoreWildcardIndex)
     AddItemSimple(include, item);
     return;
   }
-  CCensorNode &subNode = Find_SubNode_Or_Add_New(front);
+  int index = FindSubNode(front);
+  if (index < 0)
+    index = SubNodes.Add(CCensorNode(front, this));
   item.PathParts.Delete(0);
-  subNode.AddItem(include, item, ignoreWildcardIndex - 1);
+  SubNodes[index].AddItem(include, item, ignoreWildcardIndex - 1);
 }
 
-/*
-void CCensorNode::AddItem(bool include, const UString &path, const CCensorPathProps &props)
+void CCensorNode::AddItem(bool include, const UString &path, bool recursive, bool forFile, bool forDir, bool wildcardMatching)
 {
   CItem item;
   SplitPathToParts(path, item.PathParts);
-  item.Recursive = props.Recursive;
-  item.ForFile = props.ForFile;
-  item.ForDir = props.ForDir;
-  item.WildcardMatching = props.WildcardMatching;
+  item.Recursive = recursive;
+  item.ForFile = forFile;
+  item.ForDir = forDir;
+  item.WildcardMatching = wildcardMatching;
   AddItem(include, item);
 }
-*/
 
 bool CCensorNode::NeedCheckSubDirs() const
 {
@@ -426,19 +347,18 @@ bool CCensorNode::CheckPathVect(const UStringVector &pathParts, bool isFile, boo
     include = false;
     return true;
   }
-  if (pathParts.Size() > 1)
+  include = true;
+  bool finded = CheckPathCurrent(true, pathParts, isFile);
+  if (pathParts.Size() <= 1)
+    return finded;
+  int index = FindSubNode(pathParts.Front());
+  if (index >= 0)
   {
-    int index = FindSubNode(pathParts.Front());
-    if (index >= 0)
-    {
-      UStringVector pathParts2 = pathParts;
-      pathParts2.Delete(0);
-      if (SubNodes[(unsigned)index].CheckPathVect(pathParts2, isFile, include))
-        return true;
-    }
+    UStringVector pathParts2 = pathParts;
+    pathParts2.Delete(0);
+    if (SubNodes[index].CheckPathVect(pathParts2, isFile, include))
+      return true;
   }
-  bool finded = CheckPathCurrent(true, pathParts, isFile);
-  include = finded; // if (!finded), then (true) is allowed also
   return finded;
 }
 
@@ -474,26 +394,14 @@ bool CCensorNode::CheckPath(bool isAltStream, const UString &path, bool isFile)
 }
 */
 
-bool CCensorNode::CheckPathToRoot_Change(bool include, UStringVector &pathParts, bool isFile) const
+bool CCensorNode::CheckPathToRoot(bool include, UStringVector &pathParts, bool isFile) const
 {
   if (CheckPathCurrent(include, pathParts, isFile))
     return true;
-  if (!Parent)
+  if (Parent == 0)
     return false;
   pathParts.Insert(0, Name);
-  return Parent->CheckPathToRoot_Change(include, pathParts, isFile);
-}
-
-bool CCensorNode::CheckPathToRoot(bool include, const UStringVector &pathParts, bool isFile) const
-{
-  if (CheckPathCurrent(include, pathParts, isFile))
-    return true;
-  if (!Parent)
-    return false;
-  UStringVector pathParts2;
-  pathParts2.Add(Name);
-  pathParts2 += pathParts;
-  return Parent->CheckPathToRoot_Change(include, pathParts2, isFile);
+  return Parent->CheckPathToRoot(include, pathParts, isFile);
 }
 
 /*
@@ -505,21 +413,39 @@ bool CCensorNode::CheckPathToRoot(bool include, const UString &path, bool isFile
 }
 */
 
+void CCensorNode::AddItem2(bool include, const UString &path, bool recursive, bool wildcardMatching)
+{
+  if (path.IsEmpty())
+    return;
+  bool forFile = true;
+  bool forFolder = true;
+  UString path2 (path);
+  if (IsPathSepar(path.Back()))
+  {
+    path2.DeleteBack();
+    forFile = false;
+  }
+  AddItem(include, path2, recursive, forFile, forFolder, wildcardMatching);
+}
+
 void CCensorNode::ExtendExclude(const CCensorNode &fromNodes)
 {
   ExcludeItems += fromNodes.ExcludeItems;
   FOR_VECTOR (i, fromNodes.SubNodes)
   {
     const CCensorNode &node = fromNodes.SubNodes[i];
-    Find_SubNode_Or_Add_New(node.Name).ExtendExclude(node);
+    int subNodeIndex = FindSubNode(node.Name);
+    if (subNodeIndex < 0)
+      subNodeIndex = SubNodes.Add(CCensorNode(node.Name, this));
+    SubNodes[subNodeIndex].ExtendExclude(node);
   }
 }
 
-int CCensor::FindPairForPrefix(const UString &prefix) const
+int CCensor::FindPrefix(const UString &prefix) const
 {
   FOR_VECTOR (i, Pairs)
     if (CompareFileNames(Pairs[i].Prefix, prefix) == 0)
-      return (int)i;
+      return i;
   return -1;
 }
 
@@ -527,10 +453,8 @@ int CCensor::FindPairForPrefix(const UString &prefix) const
 
 bool IsDriveColonName(const wchar_t *s)
 {
-  unsigned c = s[0];
-  c |= 0x20;
-  c -= 'a';
-  return c <= (unsigned)('z' - 'a') && s[1] == ':' && s[2] == 0;
+  wchar_t c = s[0];
+  return c != 0 && s[1] == ':' && s[2] == 0 && (c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z');
 }
 
 unsigned GetNumPrefixParts_if_DrivePath(UStringVector &pathParts)
@@ -543,7 +467,7 @@ unsigned GetNumPrefixParts_if_DrivePath(UStringVector &pathParts)
   {
     if (pathParts.Size() < 4
         || !pathParts[1].IsEmpty()
-        || !pathParts[2].IsEqualTo("?"))
+        || pathParts[2] != L"?")
       return 0;
     testIndex = 3;
   }
@@ -558,12 +482,9 @@ static unsigned GetNumPrefixParts(const UStringVector &pathParts)
 {
   if (pathParts.IsEmpty())
     return 0;
-
-  /* empty last part could be removed already from (pathParts),
-     if there was tail path separator (slash) in original full path string. */
   
   #ifdef _WIN32
-
+  
   if (IsDriveColonName(pathParts[0]))
     return 1;
   if (!pathParts[0].IsEmpty())
@@ -575,11 +496,11 @@ static unsigned GetNumPrefixParts(const UStringVector &pathParts)
     return 1;
   if (pathParts.Size() == 2)
     return 2;
-  if (pathParts[2].IsEqualTo("."))
+  if (pathParts[2] == L".")
     return 3;
 
   unsigned networkParts = 2;
-  if (pathParts[2].IsEqualTo("?"))
+  if (pathParts[2] == L"?")
   {
     if (pathParts.Size() == 3)
       return 3;
@@ -604,8 +525,7 @@ static unsigned GetNumPrefixParts(const UStringVector &pathParts)
   #endif
 }
 
-void CCensor::AddItem(ECensorPathMode pathMode, bool include, const UString &path,
-    const CCensorPathProps &props)
+void CCensor::AddItem(ECensorPathMode pathMode, bool include, const UString &path, bool recursive, bool wildcardMatching)
 {
   if (path.IsEmpty())
     throw "Empty file path";
@@ -613,26 +533,12 @@ void CCensor::AddItem(ECensorPathMode pathMode, bool include, const UString &pat
   UStringVector pathParts;
   SplitPathToParts(path, pathParts);
 
-  CCensorPathProps props2 = props;
-
   bool forFile = true;
-  bool forDir = true;
-  const UString &back = pathParts.Back();
-  if (back.IsEmpty())
+  if (pathParts.Back().IsEmpty())
   {
-    // we have tail path separator. So it's directory.
-    // we delete tail path separator here even for "\" and "c:\"
     forFile = false;
     pathParts.DeleteBack();
   }
-  else
-  {
-    if (props.MarkMode == kMark_StrictFile
-        || (props.MarkMode == kMark_StrictFile_IfWildcard
-            && DoesNameContainWildcard(back)))
-      forDir = false;
-  }
-
   
   UString prefix;
   
@@ -643,13 +549,12 @@ void CCensor::AddItem(ECensorPathMode pathMode, bool include, const UString &pat
   if (pathParts.Size() >= 3
       && pathParts[0].IsEmpty()
       && pathParts[1].IsEmpty()
-      && pathParts[2].IsEqualTo("?"))
+      && pathParts[2] == L"?")
     ignoreWildcardIndex = 2;
   // #endif
 
   if (pathMode != k_AbsPath)
   {
-    // detection of the number of Skip Parts for prefix
     ignoreWildcardIndex = -1;
 
     const unsigned numPrefixParts = GetNumPrefixParts(pathParts);
@@ -657,7 +562,6 @@ void CCensor::AddItem(ECensorPathMode pathMode, bool include, const UString &pat
 
     if (pathMode != k_FullPath)
     {
-      // if absolute path, then all parts before last part will be in prefix
       if (numPrefixParts != 0 && pathParts.Size() > numPrefixParts)
         numSkipParts = pathParts.Size() - 1;
     }
@@ -666,26 +570,23 @@ void CCensor::AddItem(ECensorPathMode pathMode, bool include, const UString &pat
       for (unsigned i = numPrefixParts; i < pathParts.Size(); i++)
       {
         const UString &part = pathParts[i];
-        if (part.IsEqualTo("..") || part.IsEqualTo("."))
-          dotsIndex = (int)i;
+        if (part == L".." || part == L".")
+          dotsIndex = i;
       }
 
       if (dotsIndex >= 0)
-      {
         if (dotsIndex == (int)pathParts.Size() - 1)
           numSkipParts = pathParts.Size();
         else
           numSkipParts = pathParts.Size() - 1;
-      }
     }
 
-    // we split (pathParts) to (prefix) and (pathParts).
     for (unsigned i = 0; i < numSkipParts; i++)
     {
       {
         const UString &front = pathParts.Front();
         // WIN32 doesn't support wildcards in file names
-        if (props.WildcardMatching)
+        if (wildcardMatching)
           if (i >= numPrefixParts && DoesNameContainWildcard(front))
             break;
         prefix += front;
@@ -695,45 +596,30 @@ void CCensor::AddItem(ECensorPathMode pathMode, bool include, const UString &pat
     }
   }
 
-  int index = FindPairForPrefix(prefix);
+  int index = FindPrefix(prefix);
   if (index < 0)
-  {
-    index = (int)Pairs.Size();
-    Pairs.AddNew().Prefix = prefix;
-  }
+    index = Pairs.Add(CPair(prefix));
 
   if (pathMode != k_AbsPath)
   {
-    if (pathParts.IsEmpty() || (pathParts.Size() == 1 && pathParts[0].IsEmpty()))
+    if (pathParts.IsEmpty() || pathParts.Size() == 1 && pathParts[0].IsEmpty())
     {
       // we create universal item, if we skip all parts as prefix (like \ or L:\ )
       pathParts.Clear();
       pathParts.Add(UString("*"));
       forFile = true;
-      forDir = true;
-      props2.WildcardMatching = true;
-      props2.Recursive = false;
+      wildcardMatching = true;
+      recursive = false;
     }
   }
 
-  /*
-  // not possible now
-  if (!forDir && !forFile)
-  {
-    UString s ("file path was blocked for files and directories: ");
-    s += path;
-    throw s;
-    // return; // for debug : ignore item (don't create Item)
-  }
-  */
-
   CItem item;
   item.PathParts = pathParts;
-  item.ForDir = forDir;
+  item.ForDir = true;
   item.ForFile = forFile;
-  item.Recursive = props2.Recursive;
-  item.WildcardMatching = props2.WildcardMatching;
-  Pairs[(unsigned)index].Head.AddItem(include, item, ignoreWildcardIndex);
+  item.Recursive = recursive;
+  item.WildcardMatching = wildcardMatching;
+  Pairs[index].Head.AddItem(include, item, ignoreWildcardIndex);
 }
 
 /*
@@ -773,17 +659,18 @@ void CCensor::AddPathsToCensor(ECensorPathMode censorPathMode)
   FOR_VECTOR(i, CensorPaths)
   {
     const CCensorPath &cp = CensorPaths[i];
-    AddItem(censorPathMode, cp.Include, cp.Path, cp.Props);
+    AddItem(censorPathMode, cp.Include, cp.Path, cp.Recursive, cp.WildcardMatching);
   }
   CensorPaths.Clear();
 }
 
-void CCensor::AddPreItem(bool include, const UString &path, const CCensorPathProps &props)
+void CCensor::AddPreItem(bool include, const UString &path, bool recursive, bool wildcardMatching)
 {
   CCensorPath &cp = CensorPaths.AddNew();
   cp.Path = path;
   cp.Include = include;
-  cp.Props = props;
+  cp.Recursive = recursive;
+  cp.WildcardMatching = wildcardMatching;
 }
 
 }