Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 20 insertions, 0 deletions

diff --git a/misc/far2l/files/patch-far2l_src_mix_MountInfo.cpp b/misc/far2l/files/patch-far2l_src_mix_MountInfo.cpp
new file mode 100644
index 000000000000..3fa268388fd4
--- /dev/null
+++ b/misc/far2l/files/patch-far2l_src_mix_MountInfo.cpp
@@ -0,0 +1,20 @@
+--- far2l/src/mix/MountInfo.cpp.orig	2025-10-26 08:39:52 UTC
++++ far2l/src/mix/MountInfo.cpp
+@@ -384,7 +384,7 @@ std::string MountInfo::GetFileSystem(const std::string
+ 	return out;
+ }
+ 
+-std::string MountInfo::GetFileSystemMountPoint(const wchar_t *lpwsz_path) const
++std::string MountInfo::GetFileSystemMountPoint(const wchar_t *lpwsz_path, bool want_device) const
+ {
+ 	std::string out;
+ 	size_t longest_match = 0;
+@@ -394,7 +394,7 @@ std::string MountInfo::GetFileSystemMountPoint(const w
+ 	for (const auto &it : *_mountpoints) {
+ 		if (it.path.size() > longest_match && StrStartsFrom(path, it.path.c_str())) {
+ 			longest_match = it.path.size();
+-			out = it.path;
++			out = want_device ? it.device : it.path;
+ 		}
+ 	}
+ 	return out;