[FarGroup/FarManager] master: Refactoring (376276040)

0 views
Skip to first unread message

farg...@farmanager.com

unread,
Jul 17, 2026, 4:15:53 PM (10 days ago) Jul 17
to farco...@googlegroups.com
Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/37627604046fb2f8ec6708206f67641b0b2d35c2

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

commit 37627604046fb2f8ec6708206f67641b0b2d35c2
Author: Alex Alabuzhev <alab...@gmail.com>
Date: Thu Jul 16 13:46:39 2026 +0100

Refactoring


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

37627604046fb2f8ec6708206f67641b0b2d35c2
far/fileedit.hpp | 1 -
far/pathmix.cpp | 11 ++++++-----
far/platform.process.cpp | 1 -
3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/far/fileedit.hpp b/far/fileedit.hpp
index f8d7e3f7a..c282ec224 100644
--- a/far/fileedit.hpp
+++ b/far/fileedit.hpp
@@ -147,7 +147,6 @@ private:
void Init(string_view Name, uintptr_t codepage, const string* Title, int StartLine, int StartChar, const string* PluginData, int DeleteOnClose, const window_ptr& Update, EDITOR_FLAGS OpenModeExstFile);
bool LoadFile(string_view Name, int &UserBreak, error_state_ex& ErrorState);
bool ReloadFile(uintptr_t codepage);
- //TextFormat, Codepage и AddSignature используются ТОЛЬКО, если bSaveAs = true!
int SaveFile(string_view Name, bool bSaveAs, error_state_ex& ErrorState, eol Eol, uintptr_t& Codepage, bool AddSignature);
bool SaveAction(bool SaveAsIntention);
void SetTitle(const string* Title);
diff --git a/far/pathmix.cpp b/far/pathmix.cpp
index be9c1f2d1..691e04728 100644
--- a/far/pathmix.cpp
+++ b/far/pathmix.cpp
@@ -670,7 +670,7 @@ TEST_CASE("path.extract_root")
{
static const struct
{
- string_view Input, RootDevice, RootDirectory;
+ string_view Input, RootDevice;
}
Tests[]
{
@@ -796,19 +796,19 @@ TEST_CASE("path.PointToName")
{L"file"sv, L"file"sv},
{L"path\\"sv, {}},
{L"path\\file"sv, L"file"sv},
- // {L"C:"sv, {}},
+ {L"C:"sv, L"C:"sv}, // !
{L"C:\\"sv, {}},
{L"C:\\file"sv, L"file"sv},
{L"C:\\path\\file"sv, L"file"sv},
- // {L"\\\\?\\Volume{01e45c83-9ce4-11db-b27f-806d6172696f}"sv, {}},
+ {L"\\\\?\\Volume{01e45c83-9ce4-11db-b27f-806d6172696f}"sv, L"Volume{01e45c83-9ce4-11db-b27f-806d6172696f}"sv}, // !
{L"\\\\?\\Volume{01e45c83-9ce4-11db-b27f-806d6172696f}\\"sv, {}},
{L"\\\\?\\Volume{01e45c83-9ce4-11db-b27f-806d6172696f}\\file"sv, L"file"sv},
{L"\\\\?\\Volume{01e45c83-9ce4-11db-b27f-806d6172696f}\\path\\file"sv, L"file"sv},
- // {L"\\\\server\\share"sv, {}},
+ {L"\\\\server\\share"sv, L"share"sv}, // !
{L"\\\\server\\share\\"sv, {}},
{L"\\\\server\\share\\file"sv, L"file"sv},
{L"\\\\server\\share\\path\\file"sv, L"file"sv},
- // {L"\\\\?\\UNC\\server\\share"sv, {}},
+ {L"\\\\?\\UNC\\server\\share"sv, L"share"sv}, // !
{L"\\\\?\\UNC\\server\\share\\"sv, {}},
{L"\\\\?\\UNC\\server\\share\\file"sv, L"file"sv},
{L"\\\\?\\UNC\\server\\share\\path\\file"sv, L"file"sv},
@@ -946,6 +946,7 @@ TEST_CASE("path.PathStartsWith")
{ true, {}, {} },
{ false, {}, L"Q"sv },
{ true, L"\\"sv, {} },
+ { true, L"\\"sv, L"\\"sv },
{ false, L"C:\\path\\file"sv, {} },
{ true, L"C:\\path\\file"sv, L"C:\\path"sv },
{ true, L"C:\\path\\file"sv, L"C:\\path\\"sv },
diff --git a/far/platform.process.cpp b/far/platform.process.cpp
index ecce5c746..5c97231e9 100644
--- a/far/platform.process.cpp
+++ b/far/platform.process.cpp
@@ -392,7 +392,6 @@ namespace os::process
}

return ProcessInfos.size();
-
}

size_t enumerate_locking_processes_nt(const string_view Filename, enumerate_callback const Handler)


Reply all
Reply to author
Forward
0 new messages