GIT_SILENT made messages (after extraction)

Some fstab files only have 3 fields and mount options are completely omitted.

CMakeLists.txt

@@ -9,8 +9,8 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 # KDE Application Version, managed by release script
 set (RELEASE_SERVICE_VERSION_MAJOR "20")
-set (RELEASE_SERVICE_VERSION_MINOR "11")
+set (RELEASE_SERVICE_VERSION_MINOR "12")
-set (RELEASE_SERVICE_VERSION_MICRO "80")
+set (RELEASE_SERVICE_VERSION_MICRO "3")
 set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 project(kpmcore VERSION ${RELEASE_SERVICE_VERSION})
 

src/core/fstab.cpp

@@ -82,10 +82,17 @@ FstabEntryList readFstabEntries( const QString& fstabPath )
             // (4) dump frequency (optional, defaults to 0), no comment is allowed if omitted,
             // (5) pass number (optional, defaults to 0), no comment is allowed if omitted,
             // (#) comment (optional).
+
+            // Handle deprecated subtypes, e.g. sshfs#example. They are not relevant for partitioning, ignore them.
+            if (splitLine.size() < 3) {
+                continue;
+            }
+
             auto fsSpec = splitLine.at(0);
             auto mountPoint = unescapeSpaces(splitLine.at(1));
             auto fsType = splitLine.at(2);
-            auto options = splitLine.at(3);
+            // Options may be omitted in some rare cases like NixOS generated fstab.
+            auto options = splitLine.length() >= 4 ? splitLine.at(3) : QString::fromLatin1("defaults");
 
             switch (splitLine.length()) {
                 case 4:

src/fs/fat12.cpp

@@ -140,7 +140,9 @@ bool fat12::writeLabel(Report& report, const QString& deviceNode, const QString&
 {
     report.line() << xi18nc("@info:progress", "Setting label for partition <filename>%1</filename> to %2", deviceNode, newLabel.toUpper());
 
-    ExternalCommand cmd(report, QStringLiteral("fatlabel"), { deviceNode, newLabel.toUpper() });
+    // This is needed to support new dosfstool 4.2. Later we can drop dosfstools 4.1 and add -r flag.
+    const QString label = newLabel.isEmpty() ? QStringLiteral("NO_LABEL") : newLabel;
+    ExternalCommand cmd(report, QStringLiteral("fatlabel"), { deviceNode, label.toUpper() });
     return cmd.run(-1) && cmd.exitCode() == 0;
 }
 

src/util/externalcommandhelper.cpp

@@ -158,6 +158,21 @@ QVariantMap ExternalCommandHelper::CopyBlocks(const QString& sourceDevice, const
     if (!isCallerAuthorized()) {
         return QVariantMap();
     }
+
+    // Avoid division by zero further down
+    if (!blockSize) {
+        return QVariantMap();
+    }
+
+    // Prevent some out of memory situations
+    constexpr qint64 MiB = 1 << 30;
+    if (blockSize > 100 * MiB) {
+        return QVariantMap();
+    }
+    if (targetDevice.isEmpty() && sourceLength > MiB) {
+        return QVariantMap();
+    }
+
     QVariantMap reply;
     reply[QStringLiteral("success")] = true;
 
@@ -279,15 +294,16 @@ QVariantMap ExternalCommandHelper::RunCommand(const QString& command, const QStr
 
 //  connect(&cmd, &QProcess::readyReadStandardOutput, this, &ExternalCommandHelper::onReadOutput);
 
-    m_cmd.setEnvironment( { QStringLiteral("LVM_SUPPRESS_FD_WARNINGS=1") } );
+    QProcess cmd;
-    m_cmd.setProcessChannelMode(static_cast<QProcess::ProcessChannelMode>(processChannelMode));
+    cmd.setEnvironment( { QStringLiteral("LVM_SUPPRESS_FD_WARNINGS=1") } );
-    m_cmd.start(command, arguments);
+    cmd.setProcessChannelMode(static_cast<QProcess::ProcessChannelMode>(processChannelMode));
-    m_cmd.write(input);
+    cmd.start(command, arguments);
-    m_cmd.closeWriteChannel();
+    cmd.write(input);
-    m_cmd.waitForFinished(-1);
+    cmd.closeWriteChannel();
-    QByteArray output = m_cmd.readAllStandardOutput();
+    cmd.waitForFinished(-1);
+    QByteArray output = cmd.readAllStandardOutput();
     reply[QStringLiteral("output")] = output;
-    reply[QStringLiteral("exitCode")] = m_cmd.exitCode();
+    reply[QStringLiteral("exitCode")] = cmd.exitCode();
 
     return reply;
 }

src/util/externalcommandhelper.h

@@ -46,7 +46,6 @@ private:
     bool isCallerAuthorized();
 
     void onReadOutput();
-    QProcess m_cmd;
     QDBusServiceWatcher *m_serviceWatcher = nullptr;
 };
 

src/util/org.kde.kpmcore.externalcommand.policy

@@ -13,6 +13,7 @@ SPDX-License-Identifier: CC0-1.0
       <description xml:lang="ast">Aniciu del degorriu de comandos esternos</description>
       <description xml:lang="ca">Inicia el dimoni d'ordres externes</description>
       <description xml:lang="ca@valencia">Inicia el dimoni d'ordres externes</description>
+      <description xml:lang="de">Externen Befehlsdienst starten</description>
       <description xml:lang="el">Εκκίνηση διεργασίας με εξωτερική εντολή</description>
       <description xml:lang="en_GB">Start external command daemon</description>
       <description xml:lang="es">Iniciar el demonio de órdenes externas</description>
@@ -20,6 +21,7 @@ SPDX-License-Identifier: CC0-1.0
       <description xml:lang="it">Avvia demone per comando esterno</description>
       <description xml:lang="lt">Paleisti išorinių komandų tarnybą</description>
       <description xml:lang="nl">Start externe opdrachtdaemon</description>
+      <description xml:lang="pl">Rozpocznij usługę zewnętrznego polecenia</description>
       <description xml:lang="pt">Iniciar o servidor de comandos externos</description>
       <description xml:lang="pt_BR">Iniciar comando externo do daemon</description>
       <description xml:lang="sl">Zaženi demon za zunanje ukaze</description>
@@ -29,6 +31,7 @@ SPDX-License-Identifier: CC0-1.0
       <message xml:lang="ast">Ríquense los privilexos alministrativos pa xestionar discos</message>
       <message xml:lang="ca">Es requereixen privilegis d'administrador per a gestionar els discs</message>
       <message xml:lang="ca@valencia">Es requereixen privilegis d'administrador per a gestionar els discs</message>
+      <message xml:lang="de">Systemverwalterrechte sind zur Verwaltung von Festplatten erforderlich</message>
       <message xml:lang="el">Απαιτούνται δικαιώματα διαχειριστή για τη διαχείριση των δίσκων</message>
       <message xml:lang="en_GB">Administrative privileges are required to manage disks</message>
       <message xml:lang="es">Se necesitan permisos de administrador para gestionar discos</message>
@@ -36,6 +39,7 @@ SPDX-License-Identifier: CC0-1.0
       <message xml:lang="it">Per gestire il disco sono richiesti privilegi amministrativi</message>
       <message xml:lang="lt">Diskų tvarkymui reikalingos administratoriaus teisės</message>
       <message xml:lang="nl">Er zijn administratieve rechten vereist om schijven te beheren</message>
+      <message xml:lang="pl">Do zarządzania dyskami wymagane są uprawnienia administratora</message>
       <message xml:lang="pt">São necessários privilégios de administração para gerir os discos</message>
       <message xml:lang="pt_BR">São necessários privilégios administrativos para gerenciar discos</message>
       <message xml:lang="sl">Za upravljanje diskov so potrebne pravice upravljavca računalnika</message>