Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace partition boundary trimming with bug error messages (#48) 

All the dialogs which compose new or modified partition boundaries
create those partitions within the boundaries of the device.  Therefore
trimming the partition boundaries to device boundaries never happens.
So replace this trimming with bug error reports.

Also add bug prefixes to the other error messages in
GParted_Core::valid_partition() too.

Closes #48 - Error when moving locked LUKS-encrypted partition
This commit is contained in:
Mike Fleetwood 2019-05-21 19:31:31 +01:00 committed by Curtis Gedak
parent e3b0558f62
commit 1ed8d909fc
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/GParted_Core.cc
View File

@ -332,29 +332,43 @@ Glib::ustring GParted_Core::get_thread_status_message( )
bool GParted_Core::valid_partition(const Device& device, Partition& partition, Glib::ustring& error) bool GParted_Core::valid_partition(const Device& device, Partition& partition, Glib::ustring& error)
{ {
//Ensure that partition start and end are not beyond the ends of the disk device //Ensure that partition start and end are not beyond the ends of the disk device
if ( partition .sector_start < 0 ) if (partition.sector_start < 0)
partition .sector_start = 0 ; {
if ( partition .sector_end > device .length ) error = GPARTED_BUG + ": " +
partition .sector_end = device .length - 1 ; Glib::ustring::compose(
/* TO TRANSLATORS: looks like A partition cannot start (-2048)
* before the start of the device */
_("A partition cannot start (%1) before the start of the device"),
partition.sector_start);
return false;
}
if (partition.sector_end >= device.length)
{
error = GPARTED_BUG + ": " +
Glib::ustring::compose(
/* TO TRANSLATORS: looks like A partition cannot end (2099199)
* after the end of the device (2097151) */
_("A partition cannot end (%1) after the end of the device (%2)"),
partition.sector_start);
return false;
}
//do some basic checks on the partition //do some basic checks on the partition
if ( partition .get_sector_length() <= 0 ) if ( partition .get_sector_length() <= 0 )
{ {
error = Glib::ustring::compose( error = GPARTED_BUG + ": " +
Glib::ustring::compose(
/* TO TRANSLATORS: looks like A partition cannot have a length of -1 sectors */ /* TO TRANSLATORS: looks like A partition cannot have a length of -1 sectors */
_("A partition cannot have a length of %1 sectors"), _("A partition cannot have a length of %1 sectors"),
partition .get_sector_length() ) ; partition .get_sector_length() ) ;
return false ; return false ;
} }
//FIXME: I think that this if condition should be impossible because Partition::set_sector_usage(), // Check this partition's file system usage is valid.
// and ::set_used() and ::Set_Unused() before that, don't allow setting file usage figures to be
// larger than the partition size. A btrfs file system spanning muiltiple partitions will have
// usage figures larger than any single partition but the figures will won't be set because of
// the above reasoning. Confirm condition is impossible and consider removing this code.
if ( partition .get_sector_length() < partition .sectors_used ) if ( partition .get_sector_length() < partition .sectors_used )
{ {
error = Glib::ustring::compose( error = GPARTED_BUG + ": " +
Glib::ustring::compose(
/* TO TRANSLATORS: looks like A partition with used sectors (2048) greater than its length (1536) is not valid */ /* TO TRANSLATORS: looks like A partition with used sectors (2048) greater than its length (1536) is not valid */
_("A partition with used sectors (%1) greater than its length (%2) is not valid"), _("A partition with used sectors (%1) greater than its length (%2) is not valid"),
partition .sectors_used, partition .sectors_used,