From c25a4725070b178bff793264a9068cb68f8392e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Tue, 29 Mar 2016 20:51:15 +0300 Subject: [PATCH 01/10] Search for XmlGui (htmlreport needs it). TODO: Replace this with a lighter dependency. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8dfc46f..3de56d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,6 +57,7 @@ find_package(KF5 REQUIRED IconThemes KIO Service + XmlGui ) # use sane compile flags From 7f44e71298f057739a5b5de45d8aeb78385ecd6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Tue, 29 Mar 2016 20:55:56 +0300 Subject: [PATCH 02/10] Use KIO version instead. --- CMakeLists.txt | 1 - src/util/htmlreport.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3de56d5..8dfc46f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,6 @@ find_package(KF5 REQUIRED IconThemes KIO Service - XmlGui ) # use sane compile flags diff --git a/src/util/htmlreport.cpp b/src/util/htmlreport.cpp index 877a05f..a95fff8 100644 --- a/src/util/htmlreport.cpp +++ b/src/util/htmlreport.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include @@ -78,7 +78,7 @@ QString HtmlReport::header() << tableLine(i18n("Date:"), QLocale().toString(QDateTime::currentDateTime(), QLocale::ShortFormat)) << tableLine(i18n("Program version:"), QCoreApplication::applicationVersion()) << tableLine(i18n("Backend:"), QStringLiteral("%1 (%2)").arg(CoreBackendManager::self()->backend()->id()).arg(CoreBackendManager::self()->backend()->version())) - << tableLine(i18n("KDE Frameworks version:"), QStringLiteral(KXMLGUI_VERSION_STRING)) + << tableLine(i18n("KDE Frameworks version:"), QStringLiteral(KIO_VERSION_STRING)) << tableLine(i18n("Machine:"), unameString) << "\n
\n"; From 58e98763070dc24f9168c4354847826db79e1fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Mon, 18 Apr 2016 17:14:31 +0100 Subject: [PATCH 03/10] Rename qglobal.h to QtGlobal --- src/backend/corebackendpartitiontable.h | 2 +- src/core/copysource.h | 2 +- src/core/copysourcedevice.h | 2 +- src/core/copysourcefile.h | 2 +- src/core/copytarget.h | 2 +- src/core/copytargetdevice.h | 2 +- src/core/copytargetfile.h | 2 +- src/core/device.h | 2 +- src/core/mountentry.h | 2 +- src/core/operationrunner.h | 2 +- src/core/operationstack.h | 2 +- src/core/partition.h | 2 +- src/core/partitionalignment.h | 2 +- src/core/partitionnode.h | 2 +- src/core/partitionrole.h | 2 +- src/core/partitiontable.h | 2 +- src/core/smartstatus.h | 2 +- src/fs/btrfs.h | 2 +- src/fs/exfat.h | 2 +- src/fs/ext2.h | 2 +- src/fs/ext3.h | 2 +- src/fs/ext4.h | 2 +- src/fs/extended.h | 2 +- src/fs/f2fs.h | 2 +- src/fs/fat16.h | 2 +- src/fs/fat32.h | 2 +- src/fs/filesystem.h | 2 +- src/fs/filesystemfactory.h | 2 +- src/fs/hfs.h | 2 +- src/fs/hfsplus.h | 2 +- src/fs/hpfs.h | 2 +- src/fs/jfs.h | 2 +- src/fs/linuxswap.h | 2 +- src/fs/luks.h | 2 +- src/fs/lvm2_pv.h | 2 +- src/fs/nilfs2.h | 2 +- src/fs/ntfs.h | 2 +- src/fs/ocfs2.h | 2 +- src/fs/reiser4.h | 2 +- src/fs/reiserfs.h | 2 +- src/fs/ufs.h | 2 +- src/fs/unformatted.h | 2 +- src/fs/unknown.h | 2 +- src/fs/xfs.h | 2 +- src/fs/zfs.h | 2 +- src/jobs/copyfilesystemjob.h | 2 +- src/jobs/job.h | 2 +- src/jobs/setpartgeometryjob.h | 2 +- src/ops/operation.h | 2 +- src/plugins/dummy/dummydevice.h | 2 +- src/plugins/dummy/dummypartitiontable.h | 2 +- src/plugins/libparted/libpartedbackend.h | 2 +- src/plugins/libparted/libparteddevice.h | 2 +- src/plugins/libparted/libpartedpartitiontable.h | 2 +- src/util/capacity.h | 2 +- src/util/externalcommand.h | 2 +- src/util/globallog.h | 2 +- src/util/report.h | 2 +- 58 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/backend/corebackendpartitiontable.h b/src/backend/corebackendpartitiontable.h index a0f3e6e..b4b12ca 100644 --- a/src/backend/corebackendpartitiontable.h +++ b/src/backend/corebackendpartitiontable.h @@ -23,7 +23,7 @@ #include "../fs/filesystem.h" -#include +#include class CoreBackendPartition; class Report; diff --git a/src/core/copysource.h b/src/core/copysource.h index 99995cd..dbbebf0 100644 --- a/src/core/copysource.h +++ b/src/core/copysource.h @@ -19,7 +19,7 @@ #define COPYSOURCE__H -#include +#include class CopyTarget; diff --git a/src/core/copysourcedevice.h b/src/core/copysourcedevice.h index 9e8675b..cccfbe2 100644 --- a/src/core/copysourcedevice.h +++ b/src/core/copysourcedevice.h @@ -22,7 +22,7 @@ #include "../core/copysource.h" #include "../util/libpartitionmanagerexport.h" -#include +#include class Device; class CopyTarget; diff --git a/src/core/copysourcefile.h b/src/core/copysourcefile.h index c4265bf..6d21a18 100644 --- a/src/core/copysourcefile.h +++ b/src/core/copysourcefile.h @@ -21,7 +21,7 @@ #include "../core/copysource.h" -#include +#include #include class QString; diff --git a/src/core/copytarget.h b/src/core/copytarget.h index c5ebec5..a32573e 100644 --- a/src/core/copytarget.h +++ b/src/core/copytarget.h @@ -19,7 +19,7 @@ #define COPYTARGET__H -#include +#include /** Base class for something to copy to. diff --git a/src/core/copytargetdevice.h b/src/core/copytargetdevice.h index 1afd42e..00eb155 100644 --- a/src/core/copytargetdevice.h +++ b/src/core/copytargetdevice.h @@ -22,7 +22,7 @@ #include "../core/copytarget.h" #include "../util/libpartitionmanagerexport.h" -#include +#include class Device; class CoreBackendDevice; diff --git a/src/core/copytargetfile.h b/src/core/copytargetfile.h index 403e658..5e2e9ba 100644 --- a/src/core/copytargetfile.h +++ b/src/core/copytargetfile.h @@ -21,7 +21,7 @@ #include "../core/copytarget.h" -#include +#include #include class QString; diff --git a/src/core/device.h b/src/core/device.h index 18fc1b1..22f9522 100644 --- a/src/core/device.h +++ b/src/core/device.h @@ -23,7 +23,7 @@ #include #include -#include +#include class PartitionTable; class CreatePartitionTableOperation; diff --git a/src/core/mountentry.h b/src/core/mountentry.h index 8272b61..bc2cc50 100644 --- a/src/core/mountentry.h +++ b/src/core/mountentry.h @@ -23,7 +23,7 @@ #include #include -#include +#include struct mntent; diff --git a/src/core/operationrunner.h b/src/core/operationrunner.h index 38dd1e9..9f30107 100644 --- a/src/core/operationrunner.h +++ b/src/core/operationrunner.h @@ -23,7 +23,7 @@ #include #include -#include +#include class Operation; class OperationStack; diff --git a/src/core/operationstack.h b/src/core/operationstack.h index 52d206b..9d273e6 100644 --- a/src/core/operationstack.h +++ b/src/core/operationstack.h @@ -25,7 +25,7 @@ #include #include -#include +#include class Device; class Partition; diff --git a/src/core/partition.h b/src/core/partition.h index 27f7bd1..0464f37 100644 --- a/src/core/partition.h +++ b/src/core/partition.h @@ -26,7 +26,7 @@ #include "../util/libpartitionmanagerexport.h" #include -#include +#include class Device; class OperationStack; diff --git a/src/core/partitionalignment.h b/src/core/partitionalignment.h index 8ca700f..5818508 100644 --- a/src/core/partitionalignment.h +++ b/src/core/partitionalignment.h @@ -19,7 +19,7 @@ #define PARTITIONALIGNMENT__H -#include "qglobal.h" +#include "QtGlobal" #include "../util/libpartitionmanagerexport.h" diff --git a/src/core/partitionnode.h b/src/core/partitionnode.h index ad2347b..56e158d 100644 --- a/src/core/partitionnode.h +++ b/src/core/partitionnode.h @@ -23,7 +23,7 @@ #include #include -#include +#include class Partition; class PartitionRole; diff --git a/src/core/partitionrole.h b/src/core/partitionrole.h index 4c8c84a..07b3cf1 100644 --- a/src/core/partitionrole.h +++ b/src/core/partitionrole.h @@ -21,7 +21,7 @@ #include "../util/libpartitionmanagerexport.h" -#include +#include class QString; diff --git a/src/core/partitiontable.h b/src/core/partitiontable.h index 70473fe..1531bc4 100644 --- a/src/core/partitiontable.h +++ b/src/core/partitiontable.h @@ -26,7 +26,7 @@ #include "../core/partitionrole.h" #include -#include +#include class Device; class Partition; diff --git a/src/core/smartstatus.h b/src/core/smartstatus.h index 80332c7..d6a5a59 100644 --- a/src/core/smartstatus.h +++ b/src/core/smartstatus.h @@ -21,7 +21,7 @@ #include "../util/libpartitionmanagerexport.h" -#include +#include #include #include diff --git a/src/fs/btrfs.h b/src/fs/btrfs.h index 37fcffb..45b5326 100644 --- a/src/fs/btrfs.h +++ b/src/fs/btrfs.h @@ -24,7 +24,7 @@ #include "fs/filesystem.h" -#include +#include class Report; diff --git a/src/fs/exfat.h b/src/fs/exfat.h index b614219..16dd6e7 100644 --- a/src/fs/exfat.h +++ b/src/fs/exfat.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include class Report; diff --git a/src/fs/ext2.h b/src/fs/ext2.h index a8b8490..1c37b53 100644 --- a/src/fs/ext2.h +++ b/src/fs/ext2.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include class Report; diff --git a/src/fs/ext3.h b/src/fs/ext3.h index 158c04b..8a34b4f 100644 --- a/src/fs/ext3.h +++ b/src/fs/ext3.h @@ -23,7 +23,7 @@ #include "fs/ext2.h" -#include +#include class Report; diff --git a/src/fs/ext4.h b/src/fs/ext4.h index 056a0d8..7f971f0 100644 --- a/src/fs/ext4.h +++ b/src/fs/ext4.h @@ -23,7 +23,7 @@ #include "fs/ext2.h" -#include +#include class Report; diff --git a/src/fs/extended.h b/src/fs/extended.h index 8381498..571bc52 100644 --- a/src/fs/extended.h +++ b/src/fs/extended.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include class QString; diff --git a/src/fs/f2fs.h b/src/fs/f2fs.h index 3b6f09e..021a18e 100644 --- a/src/fs/f2fs.h +++ b/src/fs/f2fs.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include class Report; diff --git a/src/fs/fat16.h b/src/fs/fat16.h index b388b00..94bb093 100644 --- a/src/fs/fat16.h +++ b/src/fs/fat16.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include class Report; diff --git a/src/fs/fat32.h b/src/fs/fat32.h index c57f5b2..2999836 100644 --- a/src/fs/fat32.h +++ b/src/fs/fat32.h @@ -23,7 +23,7 @@ #include "fs/fat16.h" -#include +#include class Report; diff --git a/src/fs/filesystem.h b/src/fs/filesystem.h index ecc093a..c971758 100644 --- a/src/fs/filesystem.h +++ b/src/fs/filesystem.h @@ -21,7 +21,7 @@ #define FILESYSTEM__H #include "../util/libpartitionmanagerexport.h" -#include +#include #include #include #include diff --git a/src/fs/filesystemfactory.h b/src/fs/filesystemfactory.h index 6506fa9..2963a7c 100644 --- a/src/fs/filesystemfactory.h +++ b/src/fs/filesystemfactory.h @@ -24,7 +24,7 @@ #include "../util/libpartitionmanagerexport.h" #include -#include +#include class QString; diff --git a/src/fs/hfs.h b/src/fs/hfs.h index 1a75cf1..fa28d2e 100644 --- a/src/fs/hfs.h +++ b/src/fs/hfs.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include class Report; diff --git a/src/fs/hfsplus.h b/src/fs/hfsplus.h index f65a9b3..8166b0f 100644 --- a/src/fs/hfsplus.h +++ b/src/fs/hfsplus.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include class Report; diff --git a/src/fs/hpfs.h b/src/fs/hpfs.h index 984dbc2..59f783b 100644 --- a/src/fs/hpfs.h +++ b/src/fs/hpfs.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include class Report; diff --git a/src/fs/jfs.h b/src/fs/jfs.h index 0d3bc85..6b338e8 100644 --- a/src/fs/jfs.h +++ b/src/fs/jfs.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include class Report; diff --git a/src/fs/linuxswap.h b/src/fs/linuxswap.h index c4beef6..4feec02 100644 --- a/src/fs/linuxswap.h +++ b/src/fs/linuxswap.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include class Report; diff --git a/src/fs/luks.h b/src/fs/luks.h index 2a0b80e..de914d9 100644 --- a/src/fs/luks.h +++ b/src/fs/luks.h @@ -24,7 +24,7 @@ #include "../fs/filesystem.h" -#include +#include class Report; diff --git a/src/fs/lvm2_pv.h b/src/fs/lvm2_pv.h index c4aa784..700548d 100644 --- a/src/fs/lvm2_pv.h +++ b/src/fs/lvm2_pv.h @@ -24,7 +24,7 @@ #include "fs/filesystem.h" -#include +#include class Report; diff --git a/src/fs/nilfs2.h b/src/fs/nilfs2.h index b987eba..04e40a2 100644 --- a/src/fs/nilfs2.h +++ b/src/fs/nilfs2.h @@ -24,7 +24,7 @@ #include "fs/filesystem.h" -#include +#include class Report; diff --git a/src/fs/ntfs.h b/src/fs/ntfs.h index bab7d14..6c6f8a0 100644 --- a/src/fs/ntfs.h +++ b/src/fs/ntfs.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include class Report; diff --git a/src/fs/ocfs2.h b/src/fs/ocfs2.h index 2a5740f..4f477be 100644 --- a/src/fs/ocfs2.h +++ b/src/fs/ocfs2.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include class Report; diff --git a/src/fs/reiser4.h b/src/fs/reiser4.h index 232c11a..f5edc14 100644 --- a/src/fs/reiser4.h +++ b/src/fs/reiser4.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include class Report; diff --git a/src/fs/reiserfs.h b/src/fs/reiserfs.h index 8f66cbf..aa5ed60 100644 --- a/src/fs/reiserfs.h +++ b/src/fs/reiserfs.h @@ -25,7 +25,7 @@ #include "util/capacity.h" -#include +#include class Report; diff --git a/src/fs/ufs.h b/src/fs/ufs.h index 57e5349..b07f0ed 100644 --- a/src/fs/ufs.h +++ b/src/fs/ufs.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include class QString; diff --git a/src/fs/unformatted.h b/src/fs/unformatted.h index 36a8588..d38283a 100644 --- a/src/fs/unformatted.h +++ b/src/fs/unformatted.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include class Report; diff --git a/src/fs/unknown.h b/src/fs/unknown.h index 2653dce..6cc0cde 100644 --- a/src/fs/unknown.h +++ b/src/fs/unknown.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include namespace FS { diff --git a/src/fs/xfs.h b/src/fs/xfs.h index 1c2d6f0..520a33c 100644 --- a/src/fs/xfs.h +++ b/src/fs/xfs.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include class Report; diff --git a/src/fs/zfs.h b/src/fs/zfs.h index 19fecad..b9d7845 100644 --- a/src/fs/zfs.h +++ b/src/fs/zfs.h @@ -24,7 +24,7 @@ #include "fs/filesystem.h" -#include +#include class Report; diff --git a/src/jobs/copyfilesystemjob.h b/src/jobs/copyfilesystemjob.h index 3d28a04..dd4b39f 100644 --- a/src/jobs/copyfilesystemjob.h +++ b/src/jobs/copyfilesystemjob.h @@ -21,7 +21,7 @@ #include "jobs/job.h" -#include +#include class Partition; class Device; diff --git a/src/jobs/job.h b/src/jobs/job.h index 30ccbe7..821e713 100644 --- a/src/jobs/job.h +++ b/src/jobs/job.h @@ -24,7 +24,7 @@ #include "../util/libpartitionmanagerexport.h" #include -#include +#include class QString; class QIcon; diff --git a/src/jobs/setpartgeometryjob.h b/src/jobs/setpartgeometryjob.h index 2dad7e9..08ec789 100644 --- a/src/jobs/setpartgeometryjob.h +++ b/src/jobs/setpartgeometryjob.h @@ -21,7 +21,7 @@ #include "jobs/job.h" -#include +#include class Partition; class Device; diff --git a/src/ops/operation.h b/src/ops/operation.h index 847a3e6..d8d36c9 100644 --- a/src/ops/operation.h +++ b/src/ops/operation.h @@ -23,7 +23,7 @@ #include #include -#include +#include class Partition; class Device; diff --git a/src/plugins/dummy/dummydevice.h b/src/plugins/dummy/dummydevice.h index 9ec5026..f374a07 100644 --- a/src/plugins/dummy/dummydevice.h +++ b/src/plugins/dummy/dummydevice.h @@ -21,7 +21,7 @@ #include "backend/corebackenddevice.h" -#include +#include class Partition; class PartitionTable; diff --git a/src/plugins/dummy/dummypartitiontable.h b/src/plugins/dummy/dummypartitiontable.h index addc580..90a1179 100644 --- a/src/plugins/dummy/dummypartitiontable.h +++ b/src/plugins/dummy/dummypartitiontable.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include class CoreBackendPartition; class Report; diff --git a/src/plugins/libparted/libpartedbackend.h b/src/plugins/libparted/libpartedbackend.h index 7f1e38a..2a64b4a 100644 --- a/src/plugins/libparted/libpartedbackend.h +++ b/src/plugins/libparted/libpartedbackend.h @@ -30,7 +30,7 @@ #include #include -#include +#include class LibPartedDevice; class LibPartedPartitionTable; diff --git a/src/plugins/libparted/libparteddevice.h b/src/plugins/libparted/libparteddevice.h index 4b14c17..2a5a10d 100644 --- a/src/plugins/libparted/libparteddevice.h +++ b/src/plugins/libparted/libparteddevice.h @@ -21,7 +21,7 @@ #include "backend/corebackenddevice.h" -#include +#include #include diff --git a/src/plugins/libparted/libpartedpartitiontable.h b/src/plugins/libparted/libpartedpartitiontable.h index bc1a619..c41e45e 100644 --- a/src/plugins/libparted/libpartedpartitiontable.h +++ b/src/plugins/libparted/libpartedpartitiontable.h @@ -23,7 +23,7 @@ #include "fs/filesystem.h" -#include +#include #include diff --git a/src/util/capacity.h b/src/util/capacity.h index 97c1c84..f35d59a 100644 --- a/src/util/capacity.h +++ b/src/util/capacity.h @@ -23,7 +23,7 @@ class Partition; class Device; -#include +#include /** Represent any kind of capacity. diff --git a/src/util/externalcommand.h b/src/util/externalcommand.h index 758c8c8..8522e1c 100644 --- a/src/util/externalcommand.h +++ b/src/util/externalcommand.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include class Report; diff --git a/src/util/globallog.h b/src/util/globallog.h index 1b6594c..99eae5c 100644 --- a/src/util/globallog.h +++ b/src/util/globallog.h @@ -23,7 +23,7 @@ #include #include -#include +#include class LIBKPMCORE_EXPORT Log { diff --git a/src/util/report.h b/src/util/report.h index cd29abe..507b490 100644 --- a/src/util/report.h +++ b/src/util/report.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include class ReportLine; From 1ee17c38e31285dc86d87487b865dc0936533f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Wed, 20 Apr 2016 15:07:21 +0100 Subject: [PATCH 04/10] Clobber first 129 sectors of partition when deleting it. --- src/plugins/libparted/libpartedpartitiontable.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/libparted/libpartedpartitiontable.cpp b/src/plugins/libparted/libpartedpartitiontable.cpp index 5b56a51..0ae992b 100644 --- a/src/plugins/libparted/libpartedpartitiontable.cpp +++ b/src/plugins/libparted/libpartedpartitiontable.cpp @@ -252,7 +252,8 @@ bool LibPartedPartitionTable::clobberFileSystem(Report& report, const Partition& if (pedPartition->type == PED_PARTITION_NORMAL || pedPartition->type == PED_PARTITION_LOGICAL) { if (ped_device_open(pedDevice())) { //reiser4 stores "ReIsEr4" at sector 128 with a sector size of 512 bytes - rval = ped_geometry_write(&pedPartition->geom, "0000000", 65536 / pedDevice()->sector_size, 1); + char zeroes[pedDevice()->sector_size*129] = {0}; + rval = ped_geometry_write(&pedPartition->geom, zeroes, 0, 129); if (!rval) report.line() << xi18nc("@info/plain", "Failed to erase filesystem signature on partition %1.", partition.deviceNode()); From 5f87ba705f4d1d17148eb28a1aeea9e63445abc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Wed, 20 Apr 2016 15:25:17 +0100 Subject: [PATCH 05/10] Add --force flag when creating reiser4 filesystems. --- src/fs/reiser4.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fs/reiser4.cpp b/src/fs/reiser4.cpp index cab2ab0..b7e0e88 100644 --- a/src/fs/reiser4.cpp +++ b/src/fs/reiser4.cpp @@ -121,7 +121,7 @@ bool reiser4::check(Report& report, const QString& deviceNode) const bool reiser4::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("mkfs.reiser4"), QStringList() << QStringLiteral("--yes") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkfs.reiser4"), QStringList() << QStringLiteral("--yes") << QStringLiteral("--force") << deviceNode); return cmd.run(-1) && cmd.exitCode() == 0; } } From e48abb17948e088959c72f69392bddddb3f81c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Wed, 20 Apr 2016 16:03:10 +0100 Subject: [PATCH 06/10] Set libparted name for Reiser4 to be reiserfs. libparted does not support reiser4 filesystems, so formatting returned an error. --- src/plugins/libparted/libpartedpartitiontable.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/libparted/libpartedpartitiontable.cpp b/src/plugins/libparted/libpartedpartitiontable.cpp index 0ae992b..6cc2421 100644 --- a/src/plugins/libparted/libpartedpartitiontable.cpp +++ b/src/plugins/libparted/libpartedpartitiontable.cpp @@ -123,7 +123,7 @@ static const struct { { FileSystem::Ntfs, QStringLiteral("ntfs") }, { FileSystem::Exfat, QStringLiteral("ntfs") }, { FileSystem::ReiserFS, QStringLiteral("reiserfs") }, - { FileSystem::Reiser4, QStringLiteral("reiser4") }, + { FileSystem::Reiser4, QStringLiteral("reiserfs") }, { FileSystem::Xfs, QStringLiteral("xfs") }, { FileSystem::Jfs, QStringLiteral("jfs") }, { FileSystem::Hfs, QStringLiteral("hfs") }, From 01c9b9f8814419ed6746d8266e01e1cfeda56a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Wed, 20 Apr 2016 16:30:23 +0100 Subject: [PATCH 07/10] Use long command line options when possible. --- src/fs/btrfs.cpp | 4 ++-- src/fs/linuxswap.cpp | 12 ++++++------ src/fs/lvm2_pv.cpp | 6 +++--- src/fs/nilfs2.cpp | 4 ++-- src/fs/ntfs.cpp | 10 +++++----- src/fs/ocfs2.cpp | 16 ++++++++-------- src/fs/reiser4.cpp | 4 ++-- src/fs/reiserfs.cpp | 6 +++--- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/fs/btrfs.cpp b/src/fs/btrfs.cpp index 34336ca..119895b 100644 --- a/src/fs/btrfs.cpp +++ b/src/fs/btrfs.cpp @@ -126,7 +126,7 @@ bool btrfs::check(Report& report, const QString& deviceNode) const bool btrfs::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("mkfs.btrfs"), QStringList() << QStringLiteral("-f") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkfs.btrfs"), QStringList() << QStringLiteral("--force") << deviceNode); return cmd.run(-1) && cmd.exitCode() == 0; } @@ -140,7 +140,7 @@ bool btrfs::resize(Report& report, const QString& deviceNode, qint64 length) con bool rval = false; - ExternalCommand mountCmd(report, QStringLiteral("mount"), QStringList() << QStringLiteral("-v") << QStringLiteral("-t") << QStringLiteral("btrfs") << deviceNode << tempDir.path()); + ExternalCommand mountCmd(report, QStringLiteral("mount"), QStringList() << QStringLiteral("--verbose") << QStringLiteral("--types") << QStringLiteral("btrfs") << deviceNode << tempDir.path()); if (mountCmd.run(-1) && mountCmd.exitCode() == 0) { ExternalCommand resizeCmd(report, QStringLiteral("btrfs"), QStringList() << QStringLiteral("filesystem") << QStringLiteral("resize") << QString::number(length) << tempDir.path()); diff --git a/src/fs/linuxswap.cpp b/src/fs/linuxswap.cpp index c1b0284..0b68d36 100644 --- a/src/fs/linuxswap.cpp +++ b/src/fs/linuxswap.cpp @@ -88,9 +88,9 @@ bool linuxswap::resize(Report& report, const QString& deviceNode, qint64 length) QStringList args; if (!label.isEmpty()) - args << QStringLiteral("-L") << label; + args << QStringLiteral("--label") << label; if (!uuid.isEmpty()) - args << QStringLiteral("-U") << uuid; + args << QStringLiteral("--uuid") << uuid; args << deviceNode << QString::number(length / 1024); @@ -105,9 +105,9 @@ bool linuxswap::copy(Report& report, const QString& targetDeviceNode, const QStr QStringList args; if (!label.isEmpty()) - args << QStringLiteral("-L") << label; + args << QStringLiteral("--label") << label; if (!uuid.isEmpty()) - args << QStringLiteral("-U") << uuid; + args << QStringLiteral("--uuid") << uuid; args << targetDeviceNode; @@ -117,7 +117,7 @@ bool linuxswap::copy(Report& report, const QString& targetDeviceNode, const QStr bool linuxswap::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) { - ExternalCommand cmd(report, QStringLiteral("mkswap"), QStringList() << QStringLiteral("-L") << newLabel << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkswap"), QStringList() << QStringLiteral("--label") << newLabel << deviceNode); return cmd.run(-1) && cmd.exitCode() == 0; } @@ -149,7 +149,7 @@ bool linuxswap::updateUUID(Report& report, const QString& deviceNode) const QStringList args; if (!label.isEmpty()) - args << QStringLiteral("-L") << label; + args << QStringLiteral("--label") << label; args << deviceNode; diff --git a/src/fs/lvm2_pv.cpp b/src/fs/lvm2_pv.cpp index f4d22f5..e42d6fd 100644 --- a/src/fs/lvm2_pv.cpp +++ b/src/fs/lvm2_pv.cpp @@ -88,7 +88,7 @@ qint64 lvm2_pv::maxCapacity() const bool lvm2_pv::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("lvm"), QStringList() << QStringLiteral("pvck") << QStringLiteral("-v") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("lvm"), QStringList() << QStringLiteral("pvck") << QStringLiteral("--verbose") << deviceNode); return cmd.run(-1) && cmd.exitCode() == 0; } @@ -101,13 +101,13 @@ bool lvm2_pv::create(Report& report, const QString& deviceNode) const bool lvm2_pv::remove(Report& report, const QString& deviceNode) const { // TODO: check if PV is a member of an exported VG - ExternalCommand cmd(report, QStringLiteral("lvm"), QStringList() << QStringLiteral("pvremove") << QStringLiteral("-ffy") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("lvm"), QStringList() << QStringLiteral("pvremove") << QStringLiteral("--force") << QStringLiteral("--force") << QStringLiteral("--yes") << deviceNode); return cmd.run(-1) && cmd.exitCode() == 0; } bool lvm2_pv::updateUUID(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("lvm"), QStringList() << QStringLiteral("pvchange") << QStringLiteral("-u") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("lvm"), QStringList() << QStringLiteral("pvchange") << QStringLiteral("--uuid") << deviceNode); return cmd.run(-1) && cmd.exitCode() == 0; } } diff --git a/src/fs/nilfs2.cpp b/src/fs/nilfs2.cpp index 9f61a17..67f18a8 100644 --- a/src/fs/nilfs2.cpp +++ b/src/fs/nilfs2.cpp @@ -145,10 +145,10 @@ bool nilfs2::resize(Report& report, const QString& deviceNode, qint64 length) co bool rval = false; - ExternalCommand mountCmd(report, QStringLiteral("mount"), QStringList() << QStringLiteral("-v") << QStringLiteral("-t") << QStringLiteral("nilfs2") << deviceNode << tempDir.path()); + ExternalCommand mountCmd(report, QStringLiteral("mount"), QStringList() << QStringLiteral("--verbose") << QStringLiteral("--types") << QStringLiteral("nilfs2") << deviceNode << tempDir.path()); if (mountCmd.run(-1) && mountCmd.exitCode() == 0) { - ExternalCommand resizeCmd(report, QStringLiteral("nilfs-resize"), QStringList() << QStringLiteral("-v") << QStringLiteral("-y") << deviceNode << QString::number(length)); + ExternalCommand resizeCmd(report, QStringLiteral("nilfs-resize"), QStringList() << QStringLiteral("--verbose") << QStringLiteral("--assume-yes") << deviceNode << QString::number(length)); if (resizeCmd.run(-1) && resizeCmd.exitCode() == 0) rval = true; diff --git a/src/fs/ntfs.cpp b/src/fs/ntfs.cpp index 8e0f96d..421ae23 100644 --- a/src/fs/ntfs.cpp +++ b/src/fs/ntfs.cpp @@ -140,19 +140,19 @@ bool ntfs::writeLabel(Report& report, const QString& deviceNode, const QString& bool ntfs::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("ntfsresize"), QStringList() << QStringLiteral("-P") << QStringLiteral("-i") << QStringLiteral("-f") << QStringLiteral("-v") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("ntfsresize"), QStringList() << QStringLiteral("--no-progress-bar") << QStringLiteral("--info") << QStringLiteral("--force") << QStringLiteral("--verbose") << deviceNode); return cmd.run(-1) && cmd.exitCode() == 0; } bool ntfs::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("mkfs.ntfs"), QStringList() << QStringLiteral("-f") << QStringLiteral("-vv") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkfs.ntfs"), QStringList() << QStringLiteral("--quick") << QStringLiteral("--verbose") << deviceNode); return cmd.run(-1) && cmd.exitCode() == 0; } bool ntfs::copy(Report& report, const QString& targetDeviceNode, const QString& sourceDeviceNode) const { - ExternalCommand cmd(report, QStringLiteral("ntfsclone"), QStringList() << QStringLiteral("-f") << QStringLiteral("--overwrite") << targetDeviceNode << sourceDeviceNode); + ExternalCommand cmd(report, QStringLiteral("ntfsclone"), QStringList() << QStringLiteral("--force") << QStringLiteral("--overwrite") << targetDeviceNode << sourceDeviceNode); return cmd.run(-1) && cmd.exitCode() == 0; } @@ -160,10 +160,10 @@ bool ntfs::copy(Report& report, const QString& targetDeviceNode, const QString& bool ntfs::resize(Report& report, const QString& deviceNode, qint64 length) const { QStringList args; - args << QStringLiteral("-P") << QStringLiteral("-f") << deviceNode << QStringLiteral("-s") << QString::number(length); + args << QStringLiteral("--no-progress-bar") << QStringLiteral("--force") << deviceNode << QStringLiteral("--size") << QString::number(length); QStringList dryRunArgs = args; - dryRunArgs << QStringLiteral("-n"); + dryRunArgs << QStringLiteral("--no-action"); ExternalCommand cmdDryRun(QStringLiteral("ntfsresize"), dryRunArgs); if (cmdDryRun.run(-1) && cmdDryRun.exitCode() == 0) { diff --git a/src/fs/ocfs2.cpp b/src/fs/ocfs2.cpp index 53bf527..60f7f86 100644 --- a/src/fs/ocfs2.cpp +++ b/src/fs/ocfs2.cpp @@ -46,16 +46,16 @@ ocfs2::ocfs2(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QS void ocfs2::init() { - m_Create = findExternal(QStringLiteral("mkfs.ocfs2"), QStringList() << QStringLiteral("-V")) ? cmdSupportFileSystem : cmdSupportNone; + m_Create = findExternal(QStringLiteral("mkfs.ocfs2"), QStringList() << QStringLiteral("--version")) ? cmdSupportFileSystem : cmdSupportNone; m_Check = findExternal(QStringLiteral("fsck.ocfs2"), QStringList(), 16) ? cmdSupportFileSystem : cmdSupportNone; - m_Grow = (m_Check != cmdSupportNone && findExternal(QStringLiteral("tunefs.ocfs2"), QStringList() << QStringLiteral("-V")) && findExternal(QStringLiteral("debugfs.ocfs2"), QStringList() << QStringLiteral("-V"))) ? cmdSupportFileSystem : cmdSupportNone; + m_Grow = (m_Check != cmdSupportNone && findExternal(QStringLiteral("tunefs.ocfs2"), QStringList() << QStringLiteral("--version")) && findExternal(QStringLiteral("debugfs.ocfs2"), QStringList() << QStringLiteral("--version"))) ? cmdSupportFileSystem : cmdSupportNone; m_Shrink = cmdSupportNone; // TODO: it seems there's no way to get the FS usage with ocfs2 m_GetUsed = cmdSupportNone; - m_SetLabel = findExternal(QStringLiteral("tunefs.ocfs2"), QStringList() << QStringLiteral("-V")) ? cmdSupportFileSystem : cmdSupportNone; - m_UpdateUUID = findExternal(QStringLiteral("tunefs.ocfs2"), QStringList() << QStringLiteral("-V")) ? cmdSupportFileSystem : cmdSupportNone; + m_SetLabel = findExternal(QStringLiteral("tunefs.ocfs2"), QStringList() << QStringLiteral("--version")) ? cmdSupportFileSystem : cmdSupportNone; + m_UpdateUUID = findExternal(QStringLiteral("tunefs.ocfs2"), QStringList() << QStringLiteral("--version")) ? cmdSupportFileSystem : cmdSupportNone; m_Copy = (m_Check != cmdSupportNone) ? cmdSupportCore : cmdSupportNone; m_Move = (m_Check != cmdSupportNone) ? cmdSupportCore : cmdSupportNone; @@ -126,7 +126,7 @@ bool ocfs2::create(Report& report, const QString& deviceNode) const bool ocfs2::resize(Report& report, const QString& deviceNode, qint64 length) const { - ExternalCommand cmdBlockSize(QStringLiteral("debugfs.ocfs2"), QStringList() << QStringLiteral("-R") << QStringLiteral("stats") << deviceNode); + ExternalCommand cmdBlockSize(QStringLiteral("debugfs.ocfs2"), QStringList() << QStringLiteral("--request") << QStringLiteral("stats") << deviceNode); qint32 blockSize = -1; if (cmdBlockSize.run()) { @@ -139,19 +139,19 @@ bool ocfs2::resize(Report& report, const QString& deviceNode, qint64 length) con if (blockSize == -1) return false; - ExternalCommand cmd(report, QStringLiteral("tunefs.ocfs2"), QStringList() << QStringLiteral("-y") << QStringLiteral("-S") << deviceNode << QString::number(length / blockSize)); + ExternalCommand cmd(report, QStringLiteral("tunefs.ocfs2"), QStringList() << QStringLiteral("--yes") << QStringLiteral("--volume-size") << deviceNode << QString::number(length / blockSize)); return cmd.run(-1) && cmd.exitCode() == 0; } bool ocfs2::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) { - ExternalCommand cmd(report, QStringLiteral("tunefs.ocfs2"), QStringList() << QStringLiteral("-L") << newLabel << deviceNode); + ExternalCommand cmd(report, QStringLiteral("tunefs.ocfs2"), QStringList() << QStringLiteral("--label") << newLabel << deviceNode); return cmd.run(-1) && cmd.exitCode() == 0; } bool ocfs2::updateUUID(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("tunefs.ocfs2"), QStringList() << QStringLiteral("-U") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("tunefs.ocfs2"), QStringList() << QStringLiteral("--uuid-reset") << deviceNode); return cmd.run(-1) && cmd.exitCode() == 0; } } diff --git a/src/fs/reiser4.cpp b/src/fs/reiser4.cpp index b7e0e88..aa1b105 100644 --- a/src/fs/reiser4.cpp +++ b/src/fs/reiser4.cpp @@ -115,13 +115,13 @@ qint64 reiser4::readUsedCapacity(const QString& deviceNode) const bool reiser4::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("fsck.reiser4"), QStringList() << QStringLiteral("--fix") << QStringLiteral("-y") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("fsck.reiser4"), QStringList() << QStringLiteral("--fix") << QStringLiteral("--yes") << deviceNode); return cmd.run(-1) && cmd.exitCode() == 0; } bool reiser4::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("mkfs.reiser4"), QStringList() << QStringLiteral("--yes") << QStringLiteral("--force") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkfs.reiser4"), QStringList() << QStringLiteral("--force") << QStringLiteral("--yes") << deviceNode); return cmd.run(-1) && cmd.exitCode() == 0; } } diff --git a/src/fs/reiserfs.cpp b/src/fs/reiserfs.cpp index 0f61230..cbf10e3 100644 --- a/src/fs/reiserfs.cpp +++ b/src/fs/reiserfs.cpp @@ -130,13 +130,13 @@ qint64 reiserfs::readUsedCapacity(const QString& deviceNode) const bool reiserfs::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) { - ExternalCommand cmd(report, QStringLiteral("reiserfstune"), QStringList() << QStringLiteral("-l") << newLabel << deviceNode); + ExternalCommand cmd(report, QStringLiteral("reiserfstune"), QStringList() << QStringLiteral("--label") << newLabel << deviceNode); return cmd.run(-1) && cmd.exitCode() == 0; } bool reiserfs::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("fsck.reiserfs"), QStringList() << QStringLiteral("--fix-fixable") << QStringLiteral("-q") << QStringLiteral("-y") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("fsck.reiserfs"), QStringList() << QStringLiteral("--fix-fixable") << QStringLiteral("--quiet") << QStringLiteral("--yes") << deviceNode); return cmd.run(-1) && (cmd.exitCode() == 0 || cmd.exitCode() == 1 || cmd.exitCode() == 256); } @@ -164,7 +164,7 @@ bool reiserfs::resize(Report& report, const QString& deviceNode, qint64 length) bool reiserfs::updateUUID(Report& report, const QString& deviceNode) const { const QString uuid = QUuid::createUuid().toString().remove(QRegExp(QStringLiteral("\\{|\\}"))); - ExternalCommand cmd(report, QStringLiteral("reiserfstune"), QStringList() << QStringLiteral("-u") << uuid << deviceNode); + ExternalCommand cmd(report, QStringLiteral("reiserfstune"), QStringList() << QStringLiteral("--uuid") << uuid << deviceNode); return cmd.run(-1) && cmd.exitCode() == 0; } } From eb4e985933020c4305a02720dbfeaf8d778fe1cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Thu, 21 Apr 2016 22:48:05 +0100 Subject: [PATCH 08/10] Use C++11 initialization instead of << for readability. --- src/fs/btrfs.cpp | 16 +++++++++------- src/fs/exfat.cpp | 6 +++--- src/fs/ext2.cpp | 14 +++++++------- src/fs/f2fs.cpp | 4 ++-- src/fs/fat16.cpp | 12 ++++++------ src/fs/fat32.cpp | 4 ++-- src/fs/hfs.cpp | 4 ++-- src/fs/hfsplus.cpp | 2 +- src/fs/jfs.cpp | 18 +++++++++--------- src/fs/linuxswap.cpp | 8 ++++---- src/fs/lvm2_pv.cpp | 8 ++++---- src/fs/nilfs2.cpp | 16 ++++++++-------- src/fs/ntfs.cpp | 15 +++++++-------- src/fs/ocfs2.cpp | 22 +++++++++++----------- src/fs/reiser4.cpp | 12 ++++++------ src/fs/reiserfs.cpp | 16 ++++++++-------- src/fs/xfs.cpp | 18 +++++++++--------- src/fs/zfs.cpp | 9 ++++----- 18 files changed, 102 insertions(+), 102 deletions(-) diff --git a/src/fs/btrfs.cpp b/src/fs/btrfs.cpp index 119895b..16890b7 100644 --- a/src/fs/btrfs.cpp +++ b/src/fs/btrfs.cpp @@ -106,7 +106,8 @@ qint64 btrfs::maxLabelLength() const qint64 btrfs::readUsedCapacity(const QString& deviceNode) const { - ExternalCommand cmd(QStringLiteral("btrfs"), QStringList() << QStringLiteral("filesystem") << QStringLiteral("show") << QStringLiteral("--raw") << deviceNode); + ExternalCommand cmd(QStringLiteral("btrfs"), + { QStringLiteral("filesystem"), QStringLiteral("show"), QStringLiteral("--raw"), deviceNode }); if (cmd.run()) { QRegExp rxBytesUsed(QStringLiteral(" used (\\d+) path ") + deviceNode); @@ -120,13 +121,13 @@ qint64 btrfs::readUsedCapacity(const QString& deviceNode) const bool btrfs::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("btrfsck"), QStringList() << deviceNode); + ExternalCommand cmd(report, QStringLiteral("btrfsck"), { deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool btrfs::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("mkfs.btrfs"), QStringList() << QStringLiteral("--force") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkfs.btrfs"), { QStringLiteral("--force"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } @@ -140,17 +141,18 @@ bool btrfs::resize(Report& report, const QString& deviceNode, qint64 length) con bool rval = false; - ExternalCommand mountCmd(report, QStringLiteral("mount"), QStringList() << QStringLiteral("--verbose") << QStringLiteral("--types") << QStringLiteral("btrfs") << deviceNode << tempDir.path()); + ExternalCommand mountCmd(report, QStringLiteral("mount"), + { QStringLiteral("--verbose"), QStringLiteral("--types"), QStringLiteral("btrfs"), deviceNode, tempDir.path() }); if (mountCmd.run(-1) && mountCmd.exitCode() == 0) { - ExternalCommand resizeCmd(report, QStringLiteral("btrfs"), QStringList() << QStringLiteral("filesystem") << QStringLiteral("resize") << QString::number(length) << tempDir.path()); + ExternalCommand resizeCmd(report, QStringLiteral("btrfs"), { QStringLiteral("filesystem"), QStringLiteral("resize"), QString::number(length), tempDir.path() }); if (resizeCmd.run(-1) && resizeCmd.exitCode() == 0) rval = true; else report.line() << xi18nc("@info/plain", "Resizing Btrfs file system on partition %1 failed: btrfs file system resize failed.", deviceNode); - ExternalCommand unmountCmd(report, QStringLiteral("umount"), QStringList() << tempDir.path()); + ExternalCommand unmountCmd(report, QStringLiteral("umount"), { tempDir.path() }); if (!unmountCmd.run(-1) && unmountCmd.exitCode() == 0) report.line() << xi18nc("@info/plain", "Warning: Resizing Btrfs file system on partition %1: Unmount failed.", deviceNode); @@ -162,7 +164,7 @@ bool btrfs::resize(Report& report, const QString& deviceNode, qint64 length) con bool btrfs::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) { - ExternalCommand cmd(report, QStringLiteral("btrfs"), QStringList() << QStringLiteral("filesystem") << QStringLiteral("label") << deviceNode << newLabel); + ExternalCommand cmd(report, QStringLiteral("btrfs"), { QStringLiteral("filesystem"), QStringLiteral("label"), deviceNode, newLabel }); return cmd.run(-1) && cmd.exitCode() == 0; } diff --git a/src/fs/exfat.cpp b/src/fs/exfat.cpp index b3b9929..6406051 100644 --- a/src/fs/exfat.cpp +++ b/src/fs/exfat.cpp @@ -95,19 +95,19 @@ qint64 exfat::maxLabelLength() const bool exfat::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("exfatfsck"), QStringList() << deviceNode); + ExternalCommand cmd(report, QStringLiteral("exfatfsck"), { deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool exfat::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("mkfs.exfat"), QStringList() << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkfs.exfat"), { deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool exfat::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) { - ExternalCommand cmd(report, QStringLiteral("exfatlabel"), QStringList() << deviceNode << newLabel); + ExternalCommand cmd(report, QStringLiteral("exfatlabel"), { deviceNode, newLabel }); return cmd.run(-1) && cmd.exitCode() == 0; } diff --git a/src/fs/ext2.cpp b/src/fs/ext2.cpp index ad318be..3ced65a 100644 --- a/src/fs/ext2.cpp +++ b/src/fs/ext2.cpp @@ -50,7 +50,7 @@ void ext2::init() m_GetLabel = cmdSupportCore; m_SetLabel = findExternal(QStringLiteral("e2label")) ? cmdSupportFileSystem : cmdSupportNone; m_Create = findExternal(QStringLiteral("mkfs.ext2")) ? cmdSupportFileSystem : cmdSupportNone; - m_Check = findExternal(QStringLiteral("e2fsck"), QStringList() << QStringLiteral("-V")) ? cmdSupportFileSystem : cmdSupportNone; + m_Check = findExternal(QStringLiteral("e2fsck"), { QStringLiteral("-V") }) ? cmdSupportFileSystem : cmdSupportNone; m_UpdateUUID = findExternal(QStringLiteral("tune2fs")) ? cmdSupportFileSystem : cmdSupportNone; m_Grow = (m_Check != cmdSupportNone && findExternal(QStringLiteral("resize2fs"))) ? cmdSupportFileSystem : cmdSupportNone; m_Shrink = (m_Grow != cmdSupportNone && m_GetUsed) != cmdSupportNone ? cmdSupportFileSystem : cmdSupportNone; @@ -94,7 +94,7 @@ qint64 ext2::maxLabelLength() const qint64 ext2::readUsedCapacity(const QString& deviceNode) const { - ExternalCommand cmd(QStringLiteral("dumpe2fs"), QStringList() << QStringLiteral("-h") << deviceNode); + ExternalCommand cmd(QStringLiteral("dumpe2fs"), { QStringLiteral("-h"), deviceNode }); if (cmd.run()) { qint64 blockCount = -1; @@ -124,32 +124,32 @@ qint64 ext2::readUsedCapacity(const QString& deviceNode) const bool ext2::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("e2fsck"), QStringList() << QStringLiteral("-f") << QStringLiteral("-y") << QStringLiteral("-v") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("e2fsck"), { QStringLiteral("-f"), QStringLiteral("-y"), QStringLiteral("-v"), deviceNode }); return cmd.run(-1) && (cmd.exitCode() == 0 || cmd.exitCode() == 1 || cmd.exitCode() == 2 || cmd.exitCode() == 256); } bool ext2::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("mkfs.ext2"), QStringList() << QStringLiteral("-qF") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkfs.ext2"), { QStringLiteral("-qF"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool ext2::resize(Report& report, const QString& deviceNode, qint64 length) const { const QString len = QString::number(length / 512) + QStringLiteral("s"); - ExternalCommand cmd(report, QStringLiteral("resize2fs"), QStringList() << deviceNode << len); + ExternalCommand cmd(report, QStringLiteral("resize2fs"), { deviceNode, len }); return cmd.run(-1) && cmd.exitCode() == 0; } bool ext2::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) { - ExternalCommand cmd(report, QStringLiteral("e2label"), QStringList() << deviceNode << newLabel); + ExternalCommand cmd(report, QStringLiteral("e2label"), { deviceNode, newLabel }); return cmd.run(-1) && cmd.exitCode() == 0; } bool ext2::updateUUID(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("tune2fs"), QStringList() << QStringLiteral("-U") << QStringLiteral("random") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("tune2fs"), { QStringLiteral("-U"), QStringLiteral("random"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } } diff --git a/src/fs/f2fs.cpp b/src/fs/f2fs.cpp index 490b1b1..634e75d 100644 --- a/src/fs/f2fs.cpp +++ b/src/fs/f2fs.cpp @@ -109,13 +109,13 @@ qint64 f2fs::maxLabelLength() const bool f2fs::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("fsck.f2fs"), QStringList() << deviceNode); + ExternalCommand cmd(report, QStringLiteral("fsck.f2fs"), { deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool f2fs::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("mkfs.f2fs"), QStringList() << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkfs.f2fs"), { deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } diff --git a/src/fs/fat16.cpp b/src/fs/fat16.cpp index 39374e3..459c75b 100644 --- a/src/fs/fat16.cpp +++ b/src/fs/fat16.cpp @@ -53,7 +53,7 @@ fat16::fat16(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QS void fat16::init() { m_Create = findExternal(QStringLiteral("mkfs.msdos")) ? cmdSupportFileSystem : cmdSupportNone; - m_GetUsed = m_Check = findExternal(QStringLiteral("fsck.msdos"), QStringList(), 2) ? cmdSupportFileSystem : cmdSupportNone; + m_GetUsed = m_Check = findExternal(QStringLiteral("fsck.msdos"), {}, 2) ? cmdSupportFileSystem : cmdSupportNone; m_GetLabel = cmdSupportCore; m_SetLabel = findExternal(QStringLiteral("fatlabel")) ? cmdSupportFileSystem : cmdSupportNone; m_Move = cmdSupportCore; @@ -104,7 +104,7 @@ qint64 fat16::maxLabelLength() const qint64 fat16::readUsedCapacity(const QString& deviceNode) const { - ExternalCommand cmd(QStringLiteral("fsck.msdos"), QStringList() << QStringLiteral("-n") << QStringLiteral("-v") << deviceNode); + ExternalCommand cmd(QStringLiteral("fsck.msdos"), { QStringLiteral("-n"), QStringLiteral("-v"), deviceNode }); if (cmd.run()) { qint64 usedClusters = -1; @@ -131,19 +131,19 @@ bool fat16::writeLabel(Report& report, const QString& deviceNode, const QString& { report.line() << xi18nc("@info/plain", "Setting label for partition %1 to %2", deviceNode, newLabel); - ExternalCommand cmd(report, QStringLiteral("fatlabel"), QStringList() << deviceNode << newLabel); + ExternalCommand cmd(report, QStringLiteral("fatlabel"), { deviceNode, newLabel }); return cmd.run(-1) && cmd.exitCode() == 0; } bool fat16::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("fsck.msdos"), QStringList() << QStringLiteral("-a") << QStringLiteral("-w") << QStringLiteral("-v") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("fsck.msdos"), { QStringLiteral("-a"), QStringLiteral("-w"), QStringLiteral("-v"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool fat16::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("mkfs.msdos"), QStringList() << QStringLiteral("-F16") << QStringLiteral("-I") << QStringLiteral("-v") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkfs.msdos"), { QStringLiteral("-F16"), QStringLiteral("-I"), QStringLiteral("-v"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } @@ -155,7 +155,7 @@ bool fat16::updateUUID(Report& report, const QString& deviceNode) const for (quint32 i = 0; i < sizeof(uuid); i++, t >>= 8) uuid[i] = t & 0xff; - ExternalCommand cmd(report, QStringLiteral("dd"), QStringList() << QStringLiteral("of=") + deviceNode << QStringLiteral("bs=1") << QStringLiteral("count=4") << QStringLiteral("seek=39")); + ExternalCommand cmd(report, QStringLiteral("dd"), { QStringLiteral("of=") + deviceNode , QStringLiteral("bs=1"), QStringLiteral("count=4"), QStringLiteral("seek=39") }); if (!cmd.start()) return false; diff --git a/src/fs/fat32.cpp b/src/fs/fat32.cpp index 38b855c..8ab35b5 100644 --- a/src/fs/fat32.cpp +++ b/src/fs/fat32.cpp @@ -42,7 +42,7 @@ qint64 fat32::maxCapacity() const bool fat32::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("mkfs.msdos"), QStringList() << QStringLiteral("-F32") << QStringLiteral("-I") << QStringLiteral("-v") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkfs.msdos"), { QStringLiteral("-F32"), QStringLiteral("-I"), QStringLiteral("-v"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } @@ -54,7 +54,7 @@ bool fat32::updateUUID(Report& report, const QString& deviceNode) const for (quint32 i = 0; i < sizeof(uuid); i++, t >>= 8) uuid[i] = t & 0xff; - ExternalCommand cmd(report, QStringLiteral("dd"), QStringList() << QStringLiteral("of=") + deviceNode << QStringLiteral("bs=1") << QStringLiteral("count=4") << QStringLiteral("seek=67")); + ExternalCommand cmd(report, QStringLiteral("dd"), { QStringLiteral("of=") + deviceNode, QStringLiteral("bs=1"), QStringLiteral("count=4"), QStringLiteral("seek=67") }); if (!cmd.start()) return false; diff --git a/src/fs/hfs.cpp b/src/fs/hfs.cpp index 2da9637..715738d 100644 --- a/src/fs/hfs.cpp +++ b/src/fs/hfs.cpp @@ -84,13 +84,13 @@ qint64 hfs::maxLabelLength() const bool hfs::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("hfsck"), QStringList() << QStringLiteral("-v") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("hfsck"), { QStringLiteral("-v"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool hfs::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("hformat"), QStringList() << deviceNode); + ExternalCommand cmd(report, QStringLiteral("hformat"), { deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } } diff --git a/src/fs/hfsplus.cpp b/src/fs/hfsplus.cpp index 3f21941..ff70c19 100644 --- a/src/fs/hfsplus.cpp +++ b/src/fs/hfsplus.cpp @@ -79,7 +79,7 @@ qint64 hfsplus::maxLabelLength() const bool hfsplus::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("hpfsck"), QStringList() << QStringLiteral("-v") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("hpfsck"), { QStringLiteral("-v"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } } diff --git a/src/fs/jfs.cpp b/src/fs/jfs.cpp index d9fc2cc..0e664d1 100644 --- a/src/fs/jfs.cpp +++ b/src/fs/jfs.cpp @@ -50,9 +50,9 @@ void jfs::init() { m_GetUsed = findExternal(QStringLiteral("jfs_debugfs")) ? cmdSupportFileSystem : cmdSupportNone; m_GetLabel = cmdSupportCore; - m_SetLabel = findExternal(QStringLiteral("jfs_tune"), QStringList() << QStringLiteral("-V")) ? cmdSupportFileSystem : cmdSupportNone; - m_Create = findExternal(QStringLiteral("mkfs.jfs"), QStringList() << QStringLiteral("-V")) ? cmdSupportFileSystem : cmdSupportNone; - m_Grow = m_Check = findExternal(QStringLiteral("fsck.jfs"), QStringList() << QStringLiteral("-V")) ? cmdSupportFileSystem : cmdSupportNone; + m_SetLabel = findExternal(QStringLiteral("jfs_tune"), { QStringLiteral("-V") }) ? cmdSupportFileSystem : cmdSupportNone; + m_Create = findExternal(QStringLiteral("mkfs.jfs"),{ QStringLiteral("-V") }) ? cmdSupportFileSystem : cmdSupportNone; + m_Grow = m_Check = findExternal(QStringLiteral("fsck.jfs"), { QStringLiteral("-V") }) ? cmdSupportFileSystem : cmdSupportNone; m_Copy = m_Move = (m_Check != cmdSupportNone) ? cmdSupportCore : cmdSupportNone; m_Backup = cmdSupportCore; } @@ -133,19 +133,19 @@ qint64 jfs::readUsedCapacity(const QString& deviceNode) const bool jfs::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) { - ExternalCommand cmd(report, QStringLiteral("jfs_tune"), QStringList() << QStringLiteral("-L") << newLabel << deviceNode); + ExternalCommand cmd(report, QStringLiteral("jfs_tune"), { QStringLiteral("-L"), newLabel, deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool jfs::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("fsck.jfs"), QStringList() << QStringLiteral("-f") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("fsck.jfs"), { QStringLiteral("-f"), deviceNode }); return cmd.run(-1) && (cmd.exitCode() == 0 || cmd.exitCode() == 1); } bool jfs::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("mkfs.jfs"), QStringList() << QStringLiteral("-q") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkfs.jfs"), { QStringLiteral("-q"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } @@ -159,17 +159,17 @@ bool jfs::resize(Report& report, const QString& deviceNode, qint64) const bool rval = false; - ExternalCommand mountCmd(report, QStringLiteral("mount"), QStringList() << QStringLiteral("-v") << QStringLiteral("-t") << QStringLiteral("jfs") << deviceNode << tempDir.path()); + ExternalCommand mountCmd(report, QStringLiteral("mount"), { QStringLiteral("-v"), QStringLiteral("-t"), QStringLiteral("jfs"), deviceNode, tempDir.path() }); if (mountCmd.run(-1)) { - ExternalCommand resizeMountCmd(report, QStringLiteral("mount"), QStringList() << QStringLiteral("-v") << QStringLiteral("-t") << QStringLiteral("jfs") << QStringLiteral("-o") << QStringLiteral("remount,resize") << deviceNode << tempDir.path()); + ExternalCommand resizeMountCmd(report, QStringLiteral("mount"), { QStringLiteral("-v"), QStringLiteral("-t"), QStringLiteral("jfs"), QStringLiteral("-o"), QStringLiteral("remount,resize"), deviceNode, tempDir.path() }); if (resizeMountCmd.run(-1)) rval = true; else report.line() << xi18nc("@info/plain", "Resizing JFS file system on partition %1 failed: Remount failed.", deviceNode); - ExternalCommand unmountCmd(report, QStringLiteral("umount"), QStringList() << tempDir.path()); + ExternalCommand unmountCmd(report, QStringLiteral("umount"), { tempDir.path() }); if (!unmountCmd.run(-1)) report.line() << xi18nc("@info/plain", "Warning: Resizing JFS file system on partition %1: Unmount failed.", deviceNode); diff --git a/src/fs/linuxswap.cpp b/src/fs/linuxswap.cpp index 0b68d36..44fda2e 100644 --- a/src/fs/linuxswap.cpp +++ b/src/fs/linuxswap.cpp @@ -77,7 +77,7 @@ qint64 linuxswap::maxLabelLength() const bool linuxswap::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("mkswap"), QStringList() << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkswap"), { deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } @@ -117,7 +117,7 @@ bool linuxswap::copy(Report& report, const QString& targetDeviceNode, const QStr bool linuxswap::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) { - ExternalCommand cmd(report, QStringLiteral("mkswap"), QStringList() << QStringLiteral("--label") << newLabel << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkswap"), { QStringLiteral("--label"), newLabel, deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } @@ -133,13 +133,13 @@ QString linuxswap::unmountTitle() const bool linuxswap::mount(const QString& deviceNode) { - ExternalCommand cmd(QStringLiteral("swapon"), QStringList() << deviceNode); + ExternalCommand cmd(QStringLiteral("swapon"), { deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool linuxswap::unmount(const QString& deviceNode) { - ExternalCommand cmd(QStringLiteral("swapoff"), QStringList() << deviceNode); + ExternalCommand cmd(QStringLiteral("swapoff"), { deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } diff --git a/src/fs/lvm2_pv.cpp b/src/fs/lvm2_pv.cpp index e42d6fd..5af3c7c 100644 --- a/src/fs/lvm2_pv.cpp +++ b/src/fs/lvm2_pv.cpp @@ -88,26 +88,26 @@ qint64 lvm2_pv::maxCapacity() const bool lvm2_pv::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("lvm"), QStringList() << QStringLiteral("pvck") << QStringLiteral("--verbose") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("lvm"), { QStringLiteral("pvck"), QStringLiteral("--verbose"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool lvm2_pv::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("lvm"), QStringList() << QStringLiteral("pvcreate") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("lvm"), { QStringLiteral("pvcreate"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool lvm2_pv::remove(Report& report, const QString& deviceNode) const { // TODO: check if PV is a member of an exported VG - ExternalCommand cmd(report, QStringLiteral("lvm"), QStringList() << QStringLiteral("pvremove") << QStringLiteral("--force") << QStringLiteral("--force") << QStringLiteral("--yes") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("lvm"), { QStringLiteral("pvremove"), QStringLiteral("--force"), QStringLiteral("--force"), QStringLiteral("--yes"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool lvm2_pv::updateUUID(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("lvm"), QStringList() << QStringLiteral("pvchange") << QStringLiteral("--uuid") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("lvm"), { QStringLiteral("pvchange"), QStringLiteral("--uuid"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } } diff --git a/src/fs/nilfs2.cpp b/src/fs/nilfs2.cpp index 67f18a8..38da68f 100644 --- a/src/fs/nilfs2.cpp +++ b/src/fs/nilfs2.cpp @@ -110,19 +110,19 @@ qint64 nilfs2::maxLabelLength() const bool nilfs2::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("fsck.nilfs2"), QStringList() << deviceNode); + ExternalCommand cmd(report, QStringLiteral("fsck.nilfs2"), { deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool nilfs2::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("mkfs.nilfs2"), QStringList() << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkfs.nilfs2"), { deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } qint64 nilfs2::readUsedCapacity(const QString& deviceNode) const { - ExternalCommand cmd(QStringLiteral("nilfs-tune"), QStringList() << QStringLiteral("-l") << deviceNode); + ExternalCommand cmd(QStringLiteral("nilfs-tune"), { QStringLiteral("-l"), deviceNode }); if (cmd.run()) { QRegExp rxBlockSize(QStringLiteral("(?:Block size:\\s+)(\\d+)")); @@ -145,17 +145,17 @@ bool nilfs2::resize(Report& report, const QString& deviceNode, qint64 length) co bool rval = false; - ExternalCommand mountCmd(report, QStringLiteral("mount"), QStringList() << QStringLiteral("--verbose") << QStringLiteral("--types") << QStringLiteral("nilfs2") << deviceNode << tempDir.path()); + ExternalCommand mountCmd(report, QStringLiteral("mount"), { QStringLiteral("--verbose"), QStringLiteral("--types"), QStringLiteral("nilfs2"), deviceNode, tempDir.path() }); if (mountCmd.run(-1) && mountCmd.exitCode() == 0) { - ExternalCommand resizeCmd(report, QStringLiteral("nilfs-resize"), QStringList() << QStringLiteral("--verbose") << QStringLiteral("--assume-yes") << deviceNode << QString::number(length)); + ExternalCommand resizeCmd(report, QStringLiteral("nilfs-resize"), { QStringLiteral("--verbose"), QStringLiteral("--assume-yes"), deviceNode, QString::number(length) }); if (resizeCmd.run(-1) && resizeCmd.exitCode() == 0) rval = true; else report.line() << xi18nc("@info/plain", "Resizing NILFS2 file system on partition %1 failed: NILFS2 file system resize failed.", deviceNode); - ExternalCommand unmountCmd(report, QStringLiteral("umount"), QStringList() << tempDir.path()); + ExternalCommand unmountCmd(report, QStringLiteral("umount"), { tempDir.path() }); if (!unmountCmd.run(-1) && unmountCmd.exitCode() == 0) report.line() << xi18nc("@info/plain", "Warning: Resizing NILFS2 file system on partition %1: Unmount failed.", deviceNode); @@ -167,14 +167,14 @@ bool nilfs2::resize(Report& report, const QString& deviceNode, qint64 length) co bool nilfs2::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) { - ExternalCommand cmd(report, QStringLiteral("nilfs-tune"), QStringList() << QStringLiteral("-l") << newLabel << deviceNode); + ExternalCommand cmd(report, QStringLiteral("nilfs-tune"), { QStringLiteral("-l"), newLabel, deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool nilfs2::updateUUID(Report& report, const QString& deviceNode) const { QUuid uuid = QUuid::createUuid(); - ExternalCommand cmd(report, QStringLiteral("nilfs-tune"), QStringList() << QStringLiteral("-U") << uuid.toString() << deviceNode); + ExternalCommand cmd(report, QStringLiteral("nilfs-tune"), { QStringLiteral("-U"), uuid.toString(), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } } diff --git a/src/fs/ntfs.cpp b/src/fs/ntfs.cpp index 421ae23..7665017 100644 --- a/src/fs/ntfs.cpp +++ b/src/fs/ntfs.cpp @@ -105,7 +105,7 @@ qint64 ntfs::maxLabelLength() const qint64 ntfs::readUsedCapacity(const QString& deviceNode) const { - ExternalCommand cmd(QStringLiteral("ntfsresize"), QStringList() << QStringLiteral("--info") << QStringLiteral("--force") << QStringLiteral("--no-progress-bar") << deviceNode); + ExternalCommand cmd(QStringLiteral("ntfsresize"), { QStringLiteral("--info"), QStringLiteral("--force"), QStringLiteral("--no-progress-bar"), deviceNode }); if (cmd.run()) { qint64 usedBytes = -1; @@ -123,13 +123,13 @@ qint64 ntfs::readUsedCapacity(const QString& deviceNode) const bool ntfs::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) { - ExternalCommand writeCmd(report, QStringLiteral("ntfslabel"), QStringList() << QStringLiteral("--force") << deviceNode << newLabel.simplified()); + ExternalCommand writeCmd(report, QStringLiteral("ntfslabel"), { QStringLiteral("--force"), deviceNode, newLabel.simplified() }); writeCmd.setProcessChannelMode(QProcess::SeparateChannels); if (!writeCmd.run(-1)) return false; - ExternalCommand testCmd(QStringLiteral("ntfslabel"), QStringList() << QStringLiteral("--force") << deviceNode); + ExternalCommand testCmd(QStringLiteral("ntfslabel"), { QStringLiteral("--force"), deviceNode }); testCmd.setProcessChannelMode(QProcess::SeparateChannels); if (!testCmd.run(-1)) @@ -140,27 +140,26 @@ bool ntfs::writeLabel(Report& report, const QString& deviceNode, const QString& bool ntfs::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("ntfsresize"), QStringList() << QStringLiteral("--no-progress-bar") << QStringLiteral("--info") << QStringLiteral("--force") << QStringLiteral("--verbose") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("ntfsresize"), { QStringLiteral("--no-progress-bar"), QStringLiteral("--info"), QStringLiteral("--force"), QStringLiteral("--verbose"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool ntfs::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("mkfs.ntfs"), QStringList() << QStringLiteral("--quick") << QStringLiteral("--verbose") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkfs.ntfs"), { QStringLiteral("--quick"), QStringLiteral("--verbose"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool ntfs::copy(Report& report, const QString& targetDeviceNode, const QString& sourceDeviceNode) const { - ExternalCommand cmd(report, QStringLiteral("ntfsclone"), QStringList() << QStringLiteral("--force") << QStringLiteral("--overwrite") << targetDeviceNode << sourceDeviceNode); + ExternalCommand cmd(report, QStringLiteral("ntfsclone"), { QStringLiteral("--force"), QStringLiteral("--overwrite"), targetDeviceNode, sourceDeviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool ntfs::resize(Report& report, const QString& deviceNode, qint64 length) const { - QStringList args; - args << QStringLiteral("--no-progress-bar") << QStringLiteral("--force") << deviceNode << QStringLiteral("--size") << QString::number(length); + QStringList args = { QStringLiteral("--no-progress-bar"), QStringLiteral("--force"), deviceNode, QStringLiteral("--size"), QString::number(length) }; QStringList dryRunArgs = args; dryRunArgs << QStringLiteral("--no-action"); diff --git a/src/fs/ocfs2.cpp b/src/fs/ocfs2.cpp index 60f7f86..53c25f8 100644 --- a/src/fs/ocfs2.cpp +++ b/src/fs/ocfs2.cpp @@ -46,16 +46,16 @@ ocfs2::ocfs2(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QS void ocfs2::init() { - m_Create = findExternal(QStringLiteral("mkfs.ocfs2"), QStringList() << QStringLiteral("--version")) ? cmdSupportFileSystem : cmdSupportNone; - m_Check = findExternal(QStringLiteral("fsck.ocfs2"), QStringList(), 16) ? cmdSupportFileSystem : cmdSupportNone; - m_Grow = (m_Check != cmdSupportNone && findExternal(QStringLiteral("tunefs.ocfs2"), QStringList() << QStringLiteral("--version")) && findExternal(QStringLiteral("debugfs.ocfs2"), QStringList() << QStringLiteral("--version"))) ? cmdSupportFileSystem : cmdSupportNone; + m_Create = findExternal(QStringLiteral("mkfs.ocfs2"), { QStringLiteral("--version") }) ? cmdSupportFileSystem : cmdSupportNone; + m_Check = findExternal(QStringLiteral("fsck.ocfs2"), {}, 16) ? cmdSupportFileSystem : cmdSupportNone; + m_Grow = (m_Check != cmdSupportNone && findExternal(QStringLiteral("tunefs.ocfs2"), { QStringLiteral("--version") }) && findExternal(QStringLiteral("debugfs.ocfs2"), { QStringLiteral("--version") })) ? cmdSupportFileSystem : cmdSupportNone; m_Shrink = cmdSupportNone; // TODO: it seems there's no way to get the FS usage with ocfs2 m_GetUsed = cmdSupportNone; - m_SetLabel = findExternal(QStringLiteral("tunefs.ocfs2"), QStringList() << QStringLiteral("--version")) ? cmdSupportFileSystem : cmdSupportNone; - m_UpdateUUID = findExternal(QStringLiteral("tunefs.ocfs2"), QStringList() << QStringLiteral("--version")) ? cmdSupportFileSystem : cmdSupportNone; + m_SetLabel = findExternal(QStringLiteral("tunefs.ocfs2"), { QStringLiteral("--version") }) ? cmdSupportFileSystem : cmdSupportNone; + m_UpdateUUID = findExternal(QStringLiteral("tunefs.ocfs2"), { QStringLiteral("--version") }) ? cmdSupportFileSystem : cmdSupportNone; m_Copy = (m_Check != cmdSupportNone) ? cmdSupportCore : cmdSupportNone; m_Move = (m_Check != cmdSupportNone) ? cmdSupportCore : cmdSupportNone; @@ -105,13 +105,13 @@ qint64 ocfs2::readUsedCapacity(const QString& deviceNode) const bool ocfs2::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("fsck.ocfs2"), QStringList() << QStringLiteral("-f") << QStringLiteral("-y") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("fsck.ocfs2"), { QStringLiteral("-f"), QStringLiteral("-y"), deviceNode }); return cmd.run(-1) && (cmd.exitCode() == 0 || cmd.exitCode() == 1 || cmd.exitCode() == 2); } bool ocfs2::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("mkfs.ocfs2"), QStringList() << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkfs.ocfs2"), { deviceNode }); if (cmd.start()) { @@ -126,7 +126,7 @@ bool ocfs2::create(Report& report, const QString& deviceNode) const bool ocfs2::resize(Report& report, const QString& deviceNode, qint64 length) const { - ExternalCommand cmdBlockSize(QStringLiteral("debugfs.ocfs2"), QStringList() << QStringLiteral("--request") << QStringLiteral("stats") << deviceNode); + ExternalCommand cmdBlockSize(QStringLiteral("debugfs.ocfs2"), { QStringLiteral("--request"), QStringLiteral("stats"), deviceNode }); qint32 blockSize = -1; if (cmdBlockSize.run()) { @@ -139,19 +139,19 @@ bool ocfs2::resize(Report& report, const QString& deviceNode, qint64 length) con if (blockSize == -1) return false; - ExternalCommand cmd(report, QStringLiteral("tunefs.ocfs2"), QStringList() << QStringLiteral("--yes") << QStringLiteral("--volume-size") << deviceNode << QString::number(length / blockSize)); + ExternalCommand cmd(report, QStringLiteral("tunefs.ocfs2"), { QStringLiteral("--yes"), QStringLiteral("--volume-size"), deviceNode, QString::number(length / blockSize) }); return cmd.run(-1) && cmd.exitCode() == 0; } bool ocfs2::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) { - ExternalCommand cmd(report, QStringLiteral("tunefs.ocfs2"), QStringList() << QStringLiteral("--label") << newLabel << deviceNode); + ExternalCommand cmd(report, QStringLiteral("tunefs.ocfs2"), { QStringLiteral("--label"), newLabel, deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool ocfs2::updateUUID(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("tunefs.ocfs2"), QStringList() << QStringLiteral("--uuid-reset") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("tunefs.ocfs2"), { QStringLiteral("--uuid-reset"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } } diff --git a/src/fs/reiser4.cpp b/src/fs/reiser4.cpp index aa1b105..ce70981 100644 --- a/src/fs/reiser4.cpp +++ b/src/fs/reiser4.cpp @@ -42,9 +42,9 @@ reiser4::reiser4(qint64 firstsector, qint64 lastsector, qint64 sectorsused, cons void reiser4::init() { m_GetLabel = cmdSupportCore; - m_GetUsed = findExternal(QStringLiteral("debugfs.reiser4"), QStringList(), 16) ? cmdSupportFileSystem : cmdSupportNone; - m_Create = findExternal(QStringLiteral("mkfs.reiser4"), QStringList(), 16) ? cmdSupportFileSystem : cmdSupportNone; - m_Check = findExternal(QStringLiteral("fsck.reiser4"), QStringList(), 16) ? cmdSupportFileSystem : cmdSupportNone; + m_GetUsed = findExternal(QStringLiteral("debugfs.reiser4"), {}, 16) ? cmdSupportFileSystem : cmdSupportNone; + m_Create = findExternal(QStringLiteral("mkfs.reiser4"), {}, 16) ? cmdSupportFileSystem : cmdSupportNone; + m_Check = findExternal(QStringLiteral("fsck.reiser4"), {}, 16) ? cmdSupportFileSystem : cmdSupportNone; m_Move = m_Copy = (m_Check != cmdSupportNone) ? cmdSupportCore : cmdSupportNone; m_Backup = cmdSupportCore; } @@ -85,7 +85,7 @@ qint64 reiser4::maxLabelLength() const qint64 reiser4::readUsedCapacity(const QString& deviceNode) const { - ExternalCommand cmd(QStringLiteral("debugfs.reiser4"), QStringList() << deviceNode); + ExternalCommand cmd(QStringLiteral("debugfs.reiser4"), { deviceNode }); if (cmd.run()) { qint64 blocks = -1; @@ -115,13 +115,13 @@ qint64 reiser4::readUsedCapacity(const QString& deviceNode) const bool reiser4::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("fsck.reiser4"), QStringList() << QStringLiteral("--fix") << QStringLiteral("--yes") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("fsck.reiser4"), { QStringLiteral("--yes"), QStringLiteral("--fix"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool reiser4::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("mkfs.reiser4"), QStringList() << QStringLiteral("--force") << QStringLiteral("--yes") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkfs.reiser4"), { QStringLiteral("--yes"), QStringLiteral("--force"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } } diff --git a/src/fs/reiserfs.cpp b/src/fs/reiserfs.cpp index cbf10e3..337969c 100644 --- a/src/fs/reiserfs.cpp +++ b/src/fs/reiserfs.cpp @@ -49,12 +49,12 @@ reiserfs::reiserfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, co void reiserfs::init() { m_GetLabel = cmdSupportCore; - m_GetUsed = findExternal(QStringLiteral("debugreiserfs"), QStringList(), 16) ? cmdSupportFileSystem : cmdSupportNone; + m_GetUsed = findExternal(QStringLiteral("debugreiserfs"), {}, 16) ? cmdSupportFileSystem : cmdSupportNone; m_SetLabel = findExternal(QStringLiteral("reiserfstune")) ? cmdSupportFileSystem : cmdSupportNone; m_Create = findExternal(QStringLiteral("mkfs.reiserfs")) ? cmdSupportFileSystem : cmdSupportNone; m_Check = findExternal(QStringLiteral("fsck.reiserfs")) ? cmdSupportFileSystem : cmdSupportNone; m_Move = m_Copy = (m_Check != cmdSupportNone) ? cmdSupportCore : cmdSupportNone; - m_Grow = findExternal(QStringLiteral("resize_reiserfs"), QStringList(), 16) ? cmdSupportFileSystem : cmdSupportNone; + m_Grow = findExternal(QStringLiteral("resize_reiserfs"), {}, 16) ? cmdSupportFileSystem : cmdSupportNone; m_Shrink = (m_GetUsed != cmdSupportNone && m_Grow != cmdSupportNone) ? cmdSupportFileSystem : cmdSupportNone; m_Backup = cmdSupportCore; m_UpdateUUID = findExternal(QStringLiteral("reiserfstune")) ? cmdSupportFileSystem : cmdSupportNone; @@ -100,7 +100,7 @@ qint64 reiserfs::maxLabelLength() const qint64 reiserfs::readUsedCapacity(const QString& deviceNode) const { - ExternalCommand cmd(QStringLiteral("debugreiserfs"), QStringList() << deviceNode); + ExternalCommand cmd(QStringLiteral("debugreiserfs"), { deviceNode }); if (cmd.run()) { qint64 blockCount = -1; @@ -130,25 +130,25 @@ qint64 reiserfs::readUsedCapacity(const QString& deviceNode) const bool reiserfs::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) { - ExternalCommand cmd(report, QStringLiteral("reiserfstune"), QStringList() << QStringLiteral("--label") << newLabel << deviceNode); + ExternalCommand cmd(report, QStringLiteral("reiserfstune"), { QStringLiteral("--label"), newLabel, deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool reiserfs::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("fsck.reiserfs"), QStringList() << QStringLiteral("--fix-fixable") << QStringLiteral("--quiet") << QStringLiteral("--yes") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("fsck.reiserfs"), { QStringLiteral("--fix-fixable"), QStringLiteral("--quiet"), QStringLiteral("--yes"), deviceNode }); return cmd.run(-1) && (cmd.exitCode() == 0 || cmd.exitCode() == 1 || cmd.exitCode() == 256); } bool reiserfs::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("mkfs.reiserfs"), QStringList() << QStringLiteral("-f") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkfs.reiserfs"), { QStringLiteral("-f"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool reiserfs::resize(Report& report, const QString& deviceNode, qint64 length) const { - ExternalCommand cmd(report, QStringLiteral("resize_reiserfs"), QStringList() << deviceNode << QStringLiteral("-q") << QStringLiteral("-s") << QString::number(length)); + ExternalCommand cmd(report, QStringLiteral("resize_reiserfs"), { deviceNode, QStringLiteral("-q"), QStringLiteral("-s"), QString::number(length) }); bool rval = cmd.start(-1); @@ -164,7 +164,7 @@ bool reiserfs::resize(Report& report, const QString& deviceNode, qint64 length) bool reiserfs::updateUUID(Report& report, const QString& deviceNode) const { const QString uuid = QUuid::createUuid().toString().remove(QRegExp(QStringLiteral("\\{|\\}"))); - ExternalCommand cmd(report, QStringLiteral("reiserfstune"), QStringList() << QStringLiteral("--uuid") << uuid << deviceNode); + ExternalCommand cmd(report, QStringLiteral("reiserfstune"), { QStringLiteral("--uuid"), uuid, deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } } diff --git a/src/fs/xfs.cpp b/src/fs/xfs.cpp index 4d0e366..949d280 100644 --- a/src/fs/xfs.cpp +++ b/src/fs/xfs.cpp @@ -55,7 +55,7 @@ void xfs::init() m_Create = findExternal(QStringLiteral("mkfs.xfs")) ? cmdSupportFileSystem : cmdSupportNone; m_Check = findExternal(QStringLiteral("xfs_repair")) ? cmdSupportFileSystem : cmdSupportNone; - m_Grow = (findExternal(QStringLiteral("xfs_growfs"), QStringList() << QStringLiteral("-V")) && m_Check != cmdSupportNone) ? cmdSupportFileSystem : cmdSupportNone; + m_Grow = (findExternal(QStringLiteral("xfs_growfs"), { QStringLiteral("-V") }) && m_Check != cmdSupportNone) ? cmdSupportFileSystem : cmdSupportNone; m_Copy = findExternal(QStringLiteral("xfs_copy")) ? cmdSupportFileSystem : cmdSupportNone; m_Move = (m_Check != cmdSupportNone) ? cmdSupportCore : cmdSupportNone; m_Backup = cmdSupportCore; @@ -100,7 +100,7 @@ qint64 xfs::maxLabelLength() const qint64 xfs::readUsedCapacity(const QString& deviceNode) const { - ExternalCommand cmd(QStringLiteral("xfs_db"), QStringList() << QStringLiteral("-c") << QStringLiteral("sb 0") << QStringLiteral("-c") << QStringLiteral("print") << deviceNode); + ExternalCommand cmd(QStringLiteral("xfs_db"), { QStringLiteral("-c"), QStringLiteral("sb 0"), QStringLiteral("-c"), QStringLiteral("print"), deviceNode }); if (cmd.run()) { qint64 dBlocks = -1; @@ -130,25 +130,25 @@ qint64 xfs::readUsedCapacity(const QString& deviceNode) const bool xfs::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) { - ExternalCommand cmd(report, QStringLiteral("xfs_db"), QStringList() << QStringLiteral("-x") << QStringLiteral("-c") << QStringLiteral("sb 0") << QStringLiteral("-c") << QStringLiteral("label ") + newLabel << deviceNode); + ExternalCommand cmd(report, QStringLiteral("xfs_db"), { QStringLiteral("-x"), QStringLiteral("-c"), QStringLiteral("sb 0"), QStringLiteral("-c"), QStringLiteral("label ") + newLabel, deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool xfs::check(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("xfs_repair"), QStringList() << QStringLiteral("-v") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("xfs_repair"), { QStringLiteral("-v"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool xfs::create(Report& report, const QString& deviceNode) const { - ExternalCommand cmd(report, QStringLiteral("mkfs.xfs"), QStringList() << QStringLiteral("-f") << deviceNode); + ExternalCommand cmd(report, QStringLiteral("mkfs.xfs"), { QStringLiteral("-f"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } bool xfs::copy(Report& report, const QString& targetDeviceNode, const QString& sourceDeviceNode) const { - ExternalCommand cmd(report, QStringLiteral("xfs_copy"), QStringList() << sourceDeviceNode << targetDeviceNode); + ExternalCommand cmd(report, QStringLiteral("xfs_copy"), { sourceDeviceNode, targetDeviceNode }); // xfs_copy behaves a little strangely. It apparently kills itself at the end of main, causing QProcess // to report that it crashed. @@ -169,17 +169,17 @@ bool xfs::resize(Report& report, const QString& deviceNode, qint64) const bool rval = false; - ExternalCommand mountCmd(report, QStringLiteral("mount"), QStringList() << QStringLiteral("-v") << QStringLiteral("-t") << QStringLiteral("xfs") << deviceNode << tempDir.path()); + ExternalCommand mountCmd(report, QStringLiteral("mount"), { QStringLiteral("--verbose"), QStringLiteral("--types"), QStringLiteral("xfs"), deviceNode, tempDir.path() }); if (mountCmd.run(-1)) { - ExternalCommand resizeCmd(report, QStringLiteral("xfs_growfs"), QStringList() << tempDir.path()); + ExternalCommand resizeCmd(report, QStringLiteral("xfs_growfs"), { tempDir.path() }); if (resizeCmd.run(-1)) rval = true; else report.line() << xi18nc("@info/plain", "Resizing XFS file system on partition %1 failed: xfs_growfs failed.", deviceNode); - ExternalCommand unmountCmd(report, QStringLiteral("umount"), QStringList() << tempDir.path()); + ExternalCommand unmountCmd(report, QStringLiteral("umount"), { tempDir.path() }); if (!unmountCmd.run(-1)) report.line() << xi18nc("@info/plain", "Warning: Resizing XFS file system on partition %1: Unmount failed.", deviceNode); diff --git a/src/fs/zfs.cpp b/src/fs/zfs.cpp index 32d6093..7cc56ce 100644 --- a/src/fs/zfs.cpp +++ b/src/fs/zfs.cpp @@ -46,7 +46,7 @@ zfs::zfs(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QStrin void zfs::init() { - m_SetLabel = findExternal(QStringLiteral("zpool"), QStringList(), 2) ? cmdSupportFileSystem : cmdSupportNone; + m_SetLabel = findExternal(QStringLiteral("zpool"), {}, 2) ? cmdSupportFileSystem : cmdSupportNone; m_GetLabel = cmdSupportCore; m_Backup = cmdSupportCore; @@ -88,16 +88,15 @@ qint64 zfs::maxCapacity() const bool zfs::remove(Report& report, const QString& deviceNode) const { Q_UNUSED(deviceNode) -// TODO: check if -f option is needed - ExternalCommand cmd(report, QStringLiteral("zpool"), QStringList() << QStringLiteral("destroy") << QStringLiteral("-f") << this->label()); + ExternalCommand cmd(report, QStringLiteral("zpool"), { QStringLiteral("destroy"), QStringLiteral("-f"), this->label() }); return cmd.run(-1) && cmd.exitCode() == 0; } bool zfs::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) { Q_UNUSED(deviceNode) - ExternalCommand cmd1(report, QStringLiteral("zpool"), QStringList() << QStringLiteral("export") << this->label()); - ExternalCommand cmd2(report, QStringLiteral("zpool"), QStringList() << QStringLiteral("import") << this->label() << newLabel); + ExternalCommand cmd1(report, QStringLiteral("zpool"), { QStringLiteral("export"), this->label() }); + ExternalCommand cmd2(report, QStringLiteral("zpool"), { QStringLiteral("import"), this->label(), newLabel }); return cmd1.run(-1) && cmd1.exitCode() == 0 && cmd2.run(-1) && cmd2.exitCode() == 0; } } From 16f76b1623fe5ada810eb379f5d13283e25a272d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Thu, 21 Apr 2016 22:48:58 +0100 Subject: [PATCH 09/10] Remove unnecessary "this->". --- src/fs/zfs.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fs/zfs.cpp b/src/fs/zfs.cpp index 7cc56ce..fccf00a 100644 --- a/src/fs/zfs.cpp +++ b/src/fs/zfs.cpp @@ -88,15 +88,15 @@ qint64 zfs::maxCapacity() const bool zfs::remove(Report& report, const QString& deviceNode) const { Q_UNUSED(deviceNode) - ExternalCommand cmd(report, QStringLiteral("zpool"), { QStringLiteral("destroy"), QStringLiteral("-f"), this->label() }); + ExternalCommand cmd(report, QStringLiteral("zpool"), { QStringLiteral("destroy"), QStringLiteral("-f"), label() }); return cmd.run(-1) && cmd.exitCode() == 0; } bool zfs::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) { Q_UNUSED(deviceNode) - ExternalCommand cmd1(report, QStringLiteral("zpool"), { QStringLiteral("export"), this->label() }); - ExternalCommand cmd2(report, QStringLiteral("zpool"), { QStringLiteral("import"), this->label(), newLabel }); + ExternalCommand cmd1(report, QStringLiteral("zpool"), { QStringLiteral("export"), label() }); + ExternalCommand cmd2(report, QStringLiteral("zpool"), { QStringLiteral("import"), label(), newLabel }); return cmd1.run(-1) && cmd1.exitCode() == 0 && cmd2.run(-1) && cmd2.exitCode() == 0; } } From 7306c86241cee0678f5b2de089e0773de4a55b1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Thu, 21 Apr 2016 22:50:19 +0100 Subject: [PATCH 10/10] Silence a warning about unused variable. --- src/fs/ntfs.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/fs/ntfs.cpp b/src/fs/ntfs.cpp index 7665017..80f512a 100644 --- a/src/fs/ntfs.cpp +++ b/src/fs/ntfs.cpp @@ -175,6 +175,7 @@ bool ntfs::resize(Report& report, const QString& deviceNode, qint64 length) cons bool ntfs::updateUUID(Report& report, const QString& deviceNode) const { + Q_UNUSED(report); QUuid uuid = QUuid::createUuid(); char* s = reinterpret_cast(&uuid.data4[0]);