From a289c39984738bc28617a357017a9a4e50e9d34f Mon Sep 17 00:00:00 2001
From: Vladislav Shchapov <vladislav@shchapov.ru>
Date: Sat, 21 May 2022 20:12:32 +0500
Subject: [PATCH] Use custom escaping function to std::filesystem::path.

Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>
---
 include/fmt/std.h | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/include/fmt/std.h b/include/fmt/std.h
index 4a7df19c6bd64..db85758a8891a 100644
--- a/include/fmt/std.h
+++ b/include/fmt/std.h
@@ -20,8 +20,51 @@
 #  include <filesystem>
 
 FMT_BEGIN_NAMESPACE
+
+namespace detail {
+
+template <typename Char>
+void do_write_escaped_path(basic_memory_buffer<Char>& quoted,
+                           const basic_string_view<Char>& sv) {
+  quoted.push_back(Char('"'));
+  for (auto i = sv.begin(); i != sv.end(); ++i) {
+    switch (*i) {
+    case Char('"'):
+      FMT_FALLTHROUGH;
+    case Char('\\'):
+      quoted.push_back(Char('\\'));
+      FMT_FALLTHROUGH;
+    default:
+      quoted.push_back(*i);
+    }
+  }
+  quoted.push_back(Char('"'));
+}
+template <typename Char>
+void write_escaped_path(basic_memory_buffer<Char>& quoted,
+                        const std::filesystem::path& p) {
+  do_write_escaped_path<Char>(quoted, p.string<Char>());
+}
+template <>
+void write_escaped_path<std::filesystem::path::value_type>(
+    basic_memory_buffer<std::filesystem::path::value_type>& quoted,
+    const std::filesystem::path& p) {
+  do_write_escaped_path<std::filesystem::path::value_type>(quoted, p.native());
+}
+
+}  // namespace detail
+
 template <typename Char>
-struct formatter<std::filesystem::path, Char> : basic_ostream_formatter<Char> {
+struct formatter<std::filesystem::path, Char>
+    : formatter<basic_string_view<Char>> {
+  template <typename FormatContext>
+  auto format(const std::filesystem::path& p, FormatContext& ctx) const ->
+      typename FormatContext::iterator {
+    basic_memory_buffer<Char> quoted;
+    detail::write_escaped_path(quoted, p);
+    return formatter<basic_string_view<Char>>::format(
+        basic_string_view<Char>(quoted.data(), quoted.size()), ctx);
+  }
 };
 FMT_END_NAMESPACE
 #endif