From 9cbfca1c6e8ea29369b8301c0d60d0bcb7b81e82 Mon Sep 17 00:00:00 2001 From: Bart Hakvoort Date: Sun, 3 Sep 2006 18:24:09 +0000 Subject: [PATCH] check if dest >= src before starting a copy * include/GParted_Core.h, src/GParted_Core.cc: check if dest >= src before starting a copy --- ChangeLog | 5 +++++ include/GParted_Core.h | 2 +- src/GParted_Core.cc | 32 ++++++++++++++++++++------------ 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce93e20c..f11d645c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-09-03 Bart Hakvoort + + * include/GParted_Core.h, + src/GParted_Core.cc: check if dest >= src before starting a copy + 2006-09-03 Bart Hakvoort * src/GParted_Core.cc: fixed an issue with copying to unallocated diff --git a/include/GParted_Core.h b/include/GParted_Core.h index 6eeb6894..772b2c95 100644 --- a/include/GParted_Core.h +++ b/include/GParted_Core.h @@ -106,7 +106,7 @@ private: bool maximize_filesystem( const Partition & partition, OperationDetail & operationdetail ) ; bool copy( const Partition & partition_src, - Partition & partition_dest, + Partition & partition_dst, Sector min_size, OperationDetail & operationdetail ) ; bool copy_filesystem( const Partition & partition_src, diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc index 91ee237b..4b350c4a 100644 --- a/src/GParted_Core.cc +++ b/src/GParted_Core.cc @@ -1439,28 +1439,36 @@ bool GParted_Core::maximize_filesystem( const Partition & partition, OperationDe } bool GParted_Core::copy( const Partition & partition_src, - Partition & partition_dest, + Partition & partition_dst, Sector min_size, OperationDetail & operationdetail ) -{//FIXME: add a check to see if dest >= src... +{ + if ( partition_dst .get_length() < partition_src .get_length() ) + { + operationdetail .add_child( OperationDetail( + _("the destination is smaller than the sourcepartition"), STATUS_ERROR, FONT_ITALIC ) ) ; + + return false ; + } + if ( check_repair_filesystem( partition_src, operationdetail ) ) { bool succes = true ; - if ( partition_dest .status == GParted::STAT_COPY ) - succes = create_partition( partition_dest, operationdetail, min_size ) ; + if ( partition_dst .status == GParted::STAT_COPY ) + succes = create_partition( partition_dst, operationdetail, min_size ) ; - if ( succes && set_partition_type( partition_dest, operationdetail ) ) + if ( succes && set_partition_type( partition_dst, operationdetail ) ) { operationdetail .add_child( OperationDetail( String::ucompose( _("copy filesystem of %1 to %2"), partition_src .get_path(), - partition_dest .get_path() ) ) ) ; + partition_dst .get_path() ) ) ) ; - switch ( get_fs( partition_dest .filesystem ) .copy ) + switch ( get_fs( partition_dst .filesystem ) .copy ) { case GParted::FS::GPARTED : succes = copy_filesystem( partition_src, - partition_dest, + partition_dst, operationdetail .get_last_child() ) ; break ; @@ -1469,9 +1477,9 @@ bool GParted_Core::copy( const Partition & partition_src, break ; case GParted::FS::EXTERNAL : - succes = set_proper_filesystem( partition_dest .filesystem ) && + succes = set_proper_filesystem( partition_dst .filesystem ) && p_filesystem ->copy( partition_src .get_path(), - partition_dest .get_path(), + partition_dst .get_path(), operationdetail .get_last_child() ) ; break ; @@ -1483,8 +1491,8 @@ bool GParted_Core::copy( const Partition & partition_src, operationdetail .get_last_child() .set_status( succes ? STATUS_SUCCES : STATUS_ERROR ) ; return ( succes && - check_repair_filesystem( partition_dest, operationdetail ) && - maximize_filesystem( partition_dest, operationdetail ) ) ; + check_repair_filesystem( partition_dst, operationdetail ) && + maximize_filesystem( partition_dst, operationdetail ) ) ; } }