andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

Fix inline comment handling. 

CCBUG: 305469
This commit is contained in:
Andrius Štikonas 2017-09-16 20:50:57 +01:00
parent baec157314
commit 8dd1e70b21
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/fstab.cpp
View File

@ -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 } );