Merge pull request #49 from sailfishos/mkfs_args

Pass mkfs-args to udisks2 format

Author: pvuorela

src/partitionmanager.cpp

@@ -279,10 +279,13 @@ void PartitionManagerPrivate::refresh(const PartitionList &partitions, Partition
     for (auto partition : partitions) {
         if (partition->status == Partition::Mounted) {
             qint64 quotaAvailable = std::numeric_limits<qint64>::max();
-            struct if_dqblk quota;
+            struct if_dqblk quota = {};
+
             if (::quotactl(QCMD(Q_GETQUOTA, USRQUOTA), partition->devicePath.toUtf8().constData(), ::getuid(), (caddr_t)&quota) == 0
                     && quota.dqb_bsoftlimit != 0)
-                quotaAvailable = std::max((qint64)dbtob(quota.dqb_bsoftlimit) - (qint64)quota.dqb_curspace, 0LL);
+                quotaAvailable = std::max(static_cast<qint64>(dbtob(quota.dqb_bsoftlimit))
+                                          - static_cast<qint64>(quota.dqb_curspace),
+                                          0LL);
 
             // FIXME JB#56182: statvfs64() may block for a long time so would better be done in separate thread.
             struct statvfs64 stat;

src/partitionmodel.cpp

@@ -184,6 +184,12 @@ void PartitionModel::format(const QString &devicePath, const QVariantMap &argume
         args.insert(QLatin1String("encrypt.passphrase"), passphrase);
     }
 
+    QString mkfsArgs = arguments.value(QLatin1String("mkfs-args"), QString()).toString();
+    if (!mkfsArgs.isEmpty()) {
+        // assuming just one argument
+        args.insert(QLatin1String("mkfs-args"), QStringList() << mkfsArgs);
+    }
+
     qCInfo(lcMemoryCardLog) << Q_FUNC_INFO << devicePath << filesystemType << args << m_partitions.count();
     m_manager->format(devicePath, filesystemType, args);
 }
@@ -334,7 +340,7 @@ QVariant PartitionModel::data(const QModelIndex &index, int role) const
 void PartitionModel::partitionChanged(const Partition &partition)
 {
     for (int i = 0; i < m_partitions.count(); ++i) {
-        qCInfo(lcMemoryCardLog) << "partition changed:" << partition.status() << partition.mountPath();;
+        qCInfo(lcMemoryCardLog) << "partition changed:" << partition.status() << partition.mountPath();
         if (m_partitions.at(i) == partition) {
             QModelIndex index = createIndex(i, 0);
             emit dataChanged(index, index);

src/plugin/plugin.pro

@@ -2,7 +2,7 @@ TARGET = nemosystemsettings
 PLUGIN_IMPORT_PATH = org/nemomobile/systemsettings
 
 TEMPLATE = lib
-CONFIG += qt plugin c++11 hide_symbols link_pkgconfig
+CONFIG += qt plugin hide_symbols link_pkgconfig
 QT += qml dbus network
 QT -= gui