3 files changed, 6 insertions, 4 deletions
diff --git a/src/libutil/logging.cc b/src/libutil/logging.cc
index 53460f729..cbeb7aa36 100644
--- a/src/libutil/logging.cc
+++ b/src/libutil/logging.cc
@@ -37,7 +37,7 @@ void Logger::warn(const std::string & msg)
 
 void Logger::writeToStdout(std::string_view s)
 {
-    writeFull(STDOUT_FILENO, s);
+    writeFull(STDOUT_FILENO, filterANSIEscapes(s, !shouldANSI(), std::numeric_limits<unsigned int>::max(), false));
     writeFull(STDOUT_FILENO, "\n");
 }
 
diff --git a/src/libutil/terminal.cc b/src/libutil/terminal.cc
index 68d358dc5..2ba1cb81b 100644
--- a/src/libutil/terminal.cc
+++ b/src/libutil/terminal.cc
@@ -26,7 +26,8 @@ bool shouldANSI()
     return cached;
 }
 
-std::string filterANSIEscapes(std::string_view s, bool filterAll, unsigned int width)
+// FIXME(jade): replace with TerminalCodeEater. wowie this is evil code.
+std::string filterANSIEscapes(std::string_view s, bool filterAll, unsigned int width, bool eatTabs)
 {
     std::string t, e;
     size_t w = 0;
@@ -55,7 +56,7 @@ std::string filterANSIEscapes(std::string_view s, bool filterAll, unsigned int w
                 t += e;
         }
 
-        else if (*i == '\t') {
+        else if (*i == '\t' && eatTabs) {
             i++; t += ' '; w++;
             while (w < (size_t) width && w % 8) {
                 t += ' '; w++;
diff --git a/src/libutil/terminal.hh b/src/libutil/terminal.hh
index 6b8d59182..2c422ecff 100644
--- a/src/libutil/terminal.hh
+++ b/src/libutil/terminal.hh
@@ -30,7 +30,8 @@ bool shouldANSI();
  */
 std::string filterANSIEscapes(std::string_view s,
     bool filterAll = false,
-    unsigned int width = std::numeric_limits<unsigned int>::max());
+    unsigned int width = std::numeric_limits<unsigned int>::max(),
+    bool eatTabs = true);
 
 /**
  * Recalculate the window size, updating a global variable. Used in the