From 8dd1e70b2121047840b8d74fd7ae6d56ba31b90b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 16 Sep 2017 20:50:57 +0100 Subject: [PATCH] Fix inline comment handling. CCBUG: 305469 --- src/core/fstab.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/fstab.cpp b/src/core/fstab.cpp index a739453..da66235 100644 --- a/src/core/fstab.cpp +++ b/src/core/fstab.cpp @@ -68,7 +68,7 @@ FstabEntryList readFstabEntries( const QString& fstabPath ) } QString comment = line.section( QLatin1Char('#'), 1 ); - QStringList splitLine = line.section( QLatin1Char('#'), 0, 0 ).split( QRegularExpression(QStringLiteral("[\\s]+")) ); + QStringList splitLine = line.section( QLatin1Char('#'), 0, 0 ).split( QRegularExpression(QStringLiteral("[\\s]+")), QString::SkipEmptyParts ); // We now split the standard components of /etc/fstab entry: // (0) path, or UUID, or LABEL, etc, @@ -86,7 +86,7 @@ FstabEntryList readFstabEntries( const QString& fstabPath ) fstabEntries.append( {splitLine.at(0), splitLine.at(1), splitLine.at(2), splitLine.at(3), splitLine.at(4).toInt() } ); break; case 6: - fstabEntries.append( {splitLine.at(0), splitLine.at(1), splitLine.at(2), splitLine.at(3), splitLine.at(4).toInt(), splitLine.at(5).toInt(), comment } ); + fstabEntries.append( {splitLine.at(0), splitLine.at(1), splitLine.at(2), splitLine.at(3), splitLine.at(4).toInt(), splitLine.at(5).toInt(), QLatin1Char('#') + comment } ); break; default: fstabEntries.append( { {}, {}, {}, {}, {}, {}, QLatin1Char('#') + line } );