Avoid passing non-UTF-8 data to strprintf::fmt in {File,Dir}Browserfeature/2326-filepath

2 files changed, 5 insertions, 4 deletions

diff --git a/src/dirbrowserformaction.cpp b/src/dirbrowserformaction.cpp
index 49cda190..bb3d0004 100644
--- a/src/dirbrowserformaction.cpp
+++ b/src/dirbrowserformaction.cpp
@@ -325,12 +325,13 @@ void DirBrowserFormAction::add_directory(
 std::string DirBrowserFormAction::get_formatted_dirname(const Filepath& dirname,
 	mode_t mode)
 {
-	std::string tmp = dirname.to_locale_string();
+	const auto dirname_str = dirname.display();
 	const auto suffix = file_system::mode_suffix(mode);
 	if (suffix.has_value()) {
-		tmp += std::to_string(suffix.value());
+		return strprintf::fmt("%s%c", dirname_str, suffix.value());
+	} else {
+		return dirname_str;
 	}
-	return tmp;
 }
 
 std::string DirBrowserFormAction::title()
diff --git a/src/filebrowserformaction.cpp b/src/filebrowserformaction.cpp
index 5968823f..90ecf92f 100644
--- a/src/filebrowserformaction.cpp
+++ b/src/filebrowserformaction.cpp
@@ -341,7 +341,7 @@ void FileBrowserFormAction::add_file(
 std::string FileBrowserFormAction::get_formatted_filename(const Filepath& filename,
 	mode_t mode)
 {
-	const auto filename_str = filename.to_locale_string();
+	const auto filename_str = filename.display();
 	const auto suffix = file_system::mode_suffix(mode);
 	if (suffix.has_value()) {
 		return strprintf::fmt("%s%c", filename_str, suffix.value());