[FarGroup/FarManager] master: Refactoring (fb59b8c0a)

[farg...@farmanager.com]

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

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

commit fb59b8c0aeb6a1f497eb8c7ca6d4b15cf3fea147
Author: Alex Alabuzhev <alab...@gmail.com>
Date: Mon Jun 29 01:43:52 2026 +0100

Refactoring


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

fb59b8c0aeb6a1f497eb8c7ca6d4b15cf3fea147
far/changelog | 5 +++++
far/execute.cpp | 50 ++++++++++----------------------------------------
far/vbuild.m4 | 2 +-
3 files changed, 16 insertions(+), 41 deletions(-)

diff --git a/far/changelog b/far/changelog
index f3cfe8a65..e10b3407f 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 2026-06-29 01:43:41+01:00 - build 6706
+
+1. Refactoring.
+
--------------------------------------------------------------------------------
drkns 2026-06-28 19:17:21+01:00 - build 6705

diff --git a/far/execute.cpp b/far/execute.cpp
index 9988104b1..d5a33c501 100644
--- a/far/execute.cpp
+++ b/far/execute.cpp
@@ -518,38 +518,20 @@ static void after_process_creation(
execute_info const& Info,
os::handle Process,
execute_info::wait_mode const WaitMode,
- os::handle Thread,
point const& ConsoleSize,
rectangle const& ConsoleWindowRect,
- function_ref<void(bool NoWait)> const ConsoleActivator,
bool const UsingComspec
)
{
- const auto resume_process = [&](bool const NoWait)
- {
- ConsoleActivator(NoWait);
-
- if (Thread)
- {
- ResumeThread(Thread.native_handle());
- Thread = {};
- }
- };
-
switch (WaitMode)
{
case execute_info::wait_mode::no_wait:
- resume_process(true);
console.command_finished();
return;

case execute_info::wait_mode::if_needed:
{
- const auto NeedWaiting = os::process::get_process_subsystem(Process.get()) != os::process::image_type::graphical;
-
- resume_process(!NeedWaiting);
-
- if (!NeedWaiting)
+ if (os::process::get_process_subsystem(Process.get()) == os::process::image_type::graphical)
{
console.command_finished();
return;
@@ -564,7 +546,6 @@ static void after_process_creation(
return;

case execute_info::wait_mode::wait_finish:
- resume_process(false);
Process.wait();
log_process_exit_code(Info, Process, UsingComspec);
return;
@@ -627,7 +608,7 @@ static bool execute_createprocess(string const& Command, string const& Parameter
{},
{},
false,
- CREATE_DEFAULT_ERROR_MODE | CREATE_SUSPENDED | (Wait? 0 : CREATE_NEW_CONSOLE),
+ CREATE_DEFAULT_ERROR_MODE | (Wait? 0 : CREATE_NEW_CONSOLE),
{},
Directory.c_str(),
&si,
@@ -748,19 +729,11 @@ static bool execute_impl(
rectangle ConsoleWindowRect;
point ConsoleSize;
std::optional<external_execution_context> Context;
- auto ConsoleActivatorInvoked = false;

const auto ExtendedActivator = [&](bool NoWait)
{
- if (Context)
- return;
-
- if (!ConsoleActivatorInvoked)
- {
- ConsoleActivator(NoWait);
- ConsoleActivatorInvoked = true;
- }
-
+ assert(!Context);
+ ConsoleActivator(NoWait);
console.GetWindowRect(ConsoleWindowRect);
console.GetSize(ConsoleSize);
Context.emplace();
@@ -809,10 +782,14 @@ static bool execute_impl(
if (!exec_with_short_names_fallback(exec, Command, CurrentDirectory))
return false;

- after_process_creation(Info, os::handle(pi.hProcess), Info.WaitMode, os::handle(pi.hThread), ConsoleSize, ConsoleWindowRect, ExtendedActivator, UsingComspec);
+ os::handle{ pi.hThread };
+ after_process_creation(Info, os::handle(pi.hProcess), Info.WaitMode, ConsoleSize, ConsoleWindowRect, UsingComspec);
return true;
};

+ if (Info.SourceMode != execute_info::source_mode::known_external_folder)
+ ExtendedActivator(Info.WaitMode == execute_info::wait_mode::no_wait);
+
// Filter out the cases where the source is known, but is not a known executable (exe, com, bat, cmd, see IsExecutable in filelist.cpp)
// This should cover gh-449 and is usually pointless anyway.
if (
@@ -823,16 +800,9 @@ static bool execute_impl(
return true;

if (os::last_error().Win32Error == ERROR_EXE_MACHINE_TYPE_MISMATCH)
- {
- SCOPED_ACTION(os::last_error_guard);
- ExtendedActivator(true);
return false;
- }
}

- if (Info.SourceMode != execute_info::source_mode::known_external_folder)
- ExtendedActivator(Info.WaitMode == execute_info::wait_mode::no_wait);
-
const auto execute_shell = [&]
{
HANDLE Process;
@@ -846,7 +816,7 @@ static bool execute_impl(
return false;

if (Process)
- after_process_creation(Info, os::handle(Process), Info.WaitMode, {}, ConsoleSize, ConsoleWindowRect, [](bool){}, UsingComspec);
+ after_process_creation(Info, os::handle(Process), Info.WaitMode, ConsoleSize, ConsoleWindowRect, UsingComspec);

return true;
};
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index 4374e227c..51ea4a54f 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-6705
+670