Fixing recognition of pipe character as include/exclude file masks delimiter

Backported from https://github.com/shmuz/far2l/commit/1ddb8a79d6dbc204e2f4564b3c4c551ddb3447dc

1 files changed, 22 insertions, 18 deletions

diff --git a/far2l/src/filemask/FileMasksWithExclude.cpp b/far2l/src/filemask/FileMasksWithExclude.cpp
index 1fed7207..a64c2ea6 100644
--- a/far2l/src/filemask/FileMasksWithExclude.cpp
+++ b/far2l/src/filemask/FileMasksWithExclude.cpp
@@ -56,27 +56,31 @@ bool FileMasksWithExclude::IsExcludeMask(const wchar_t *masks)
 
 const wchar_t *FileMasksWithExclude::FindExcludeChar(const wchar_t *masks)
 {
-	const wchar_t *pExclude = masks;
-
-	if (*pExclude == '\\')
-	{
-		pExclude++;
-
-		while (*pExclude && (*pExclude != '\\' || *(pExclude-1) == GOOD_SLASH))
-			pExclude++;
-
-		while (*pExclude && *pExclude != EXCLUDEMASKSEPARATOR)
-			pExclude++;
-
-		if (*pExclude != EXCLUDEMASKSEPARATOR)
-			pExclude = nullptr;
-	}
-	else
+	if (masks)
 	{
-		pExclude = wcschr(masks,EXCLUDEMASKSEPARATOR);
+		for (bool regexp=false; *masks; masks++)
+		{
+			if (!regexp)
+			{
+				if (*masks == EXCLUDEMASKSEPARATOR)
+					return masks;
+				if (*masks == L'/')
+					regexp = true;
+			}
+			else
+			{
+				if (*masks == L'\\')
+				{
+					if (*(++masks) == 0) // skip the next char
+						break;
+				}
+				else if (*masks == L'/')
+					regexp = false;
+			}
+		}
 	}
 
-	return pExclude;
+	return nullptr;
 }
 
 /*