Skip to content
Permalink
Browse files

and again

  • Loading branch information...
alabuzhev committed Oct 2, 2017
1 parent 9a880ce commit 0258dda969de8c0bda5a2e2dbeaaa0864fd0527e
Showing with 7 additions and 3 deletions.
  1. +4 −0 far/changelog
  2. +2 −2 far/processname.cpp
  3. +1 −1 far/vbuild.m4
@@ -1,3 +1,7 @@
drkns 02.10.2017 16:09:16 +0100 - build 5060

1. И ещё.

drkns 02.10.2017 15:59:05 +0100 - build 5059

1. И ещё одно уточнение 5049.
@@ -173,15 +173,15 @@ bool CmpName(string_view pattern, string_view str, bool skippath, bool CmpNameSe
*/
if (pattern[0] == L'.')
{
if (pattern[1]==L'*' && !pattern[2])
if (pattern.size() == 2 && pattern[1]==L'*')
return true;

if (std::none_of(ALL_CONST_RANGE(pattern), [](wchar_t Char) { return wcschr(L"*?[", Char) != nullptr; }))
{
const auto RDotIt = std::find(ALL_CONST_REVERSE_RANGE(str), L'.');
auto DotIt = RDotIt == str.crend()? str.cend() : (RDotIt + 1).base();

if (!pattern[1])
if (pattern.size() == 1)
return DotIt == str.cend() || DotIt + 1 == str.cend();

const auto PatternContainsDot = contains(pattern.substr(1), L'.');
@@ -1 +1 @@
m4_define(BUILD,5059)m4_dnl
m4_define(BUILD,5060)m4_dnl

0 comments on commit 0258dda

Please sign in to comment.
You can’t perform that action at this time.