[FarGroup/FarManager] master: Fix 5281.2 (286bedd58)

[farg...@farmanager.com]

Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/286bedd58af6798fee65c414ce12461dba1ea8b6

>---------------------------------------------------------------

commit 286bedd58af6798fee65c414ce12461dba1ea8b6
Author: Alex Alabuzhev <alab...@gmail.com>
Date: Wed Jun 26 18:13:39 2024 +0100

Fix 5281.2


>---------------------------------------------------------------

286bedd58af6798fee65c414ce12461dba1ea8b6
far/changelog | 5 +++++
far/processname.cpp | 11 +----------
far/vbuild.m4 | 2 +-
3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/far/changelog b/far/changelog
index 06b02d26b..9826a9498 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 2024-06-26 18:12:34+01:00 - build 6344
+
+1. Fix 5281.2.
+
--------------------------------------------------------------------------------
drkns 2024-06-01 18:14:25+01:00 - build 6343

diff --git a/far/processname.cpp b/far/processname.cpp
index 7f1cb0ada..adb50d805 100644
--- a/far/processname.cpp
+++ b/far/processname.cpp
@@ -50,15 +50,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

//----------------------------------------------------------------------------

-/* $ 09.10.2000 IS
- Генерация нового имени по маске
- (взял из ShellCopy::ShellCopyConvertWildcards)
-*/
-// На основе имени файла (SrcName) и маски (Mask) генерируем новое имя
-// SelectedFolderNameLength - длина каталога. Например, есть
-// каталог dir1, а в нем файл file1. Нужно сгенерировать имя по маске для dir1.
-// Параметры могут быть следующими: Src="dir1", SelectedFolderNameLength=0
-// или Src="dir1\\file1", а SelectedFolderNameLength=4 (длина "dir1")
string ConvertWildcards(string_view const SrcName, string_view const Mask)
{
const auto WildName = PointToName(Mask);
@@ -71,7 +62,7 @@ string ConvertWildcards(string_view const SrcName, string_view const Mask)
Result.reserve(SrcName.size());
Result = Mask.substr(0, Mask.size() - WildName.size());

- const auto BeforeNameLength = Result.empty()? 0 : SrcName.size() - SrcNamePart.size();
+ const auto BeforeNameLength = Result.empty()? SrcName.size() - SrcNamePart.size() : 0;

auto WildPtr = WildName;

diff --git a/far/vbuild.m4 b/far/vbuild.m4
index e3a7b92c6..2bf3c0b36 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-6343
+6344