1 files changed, 4 insertions, 2 deletions
diff --git a/src/Util.cpp b/src/Util.cpp
index e1b0d865..82afba8d 100644
--- a/src/Util.cpp
+++ b/src/Util.cpp
@@ -525,9 +525,11 @@ format_argv_for_logging(const char* const* argv)
     if (i != 0) {
       result += ' ';
     }
-    for (const char* arg = argv[i]; *arg; ++arg) {
-      result += *arg;
+    std::string arg(argv[i]);
+    if (arg.empty() || arg.find(' ') != std::string::npos) {
+      arg = FMT("\"{}\"", arg);
     }
+    result += arg;
   }
   return result;
 }