From 31921c59fa50716dd7118fb7eb996c710e2f5a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Sat, 4 Dec 2021 23:31:02 +0000
Subject: [PATCH] Fix broken fstab when mount point includes space.

fstab column width was calculated before spaces were escaped which would
result in no space between mount point and file system type columns.

BUG: 446218
---
 src/core/fstab.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/fstab.cpp b/src/core/fstab.cpp
index 4ff8e62..486046b 100644
--- a/src/core/fstab.cpp
+++ b/src/core/fstab.cpp
@@ -265,7 +265,7 @@ std::array<unsigned int, 4> fstabColumnWidth(const FstabEntryList& fstabEntries)
 {
     std::array<unsigned int, 4> columnWidth;
 
-#define FIELD_WIDTH(x) 3 + std::max_element(fstabEntries.begin(), fstabEntries.end(), [](const FstabEntry& a, const FstabEntry& b) {return a.x().length() < b.x().length(); })->x().length();
+#define FIELD_WIDTH(x) 3 + escapeSpaces(std::max_element(fstabEntries.begin(), fstabEntries.end(), [](const FstabEntry& a, const FstabEntry& b) {return escapeSpaces(a.x()).length() < escapeSpaces(b.x()).length(); })->x()).length();
 
     columnWidth[0] = FIELD_WIDTH(fsSpec);
     columnWidth[1] = FIELD_WIDTH(mountPoint);