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

resizing now contains detailed feedback 

* src/jfs.cc: resizing now contains detailed feedback
This commit is contained in:
Bart Hakvoort 2006-01-19 21:42:38 +00:00
parent 97a9a5fa87
commit 4ad5ef49a4
2 changed files with 79 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2006-01-19 Bart Hakvoort <hakvoort@cvs.gnome.org>
* src/jfs.cc: resizing now contains detailed feedback
2006-01-19 Bart Hakvoort <hakvoort@cvs.gnome.org> 2006-01-19 Bart Hakvoort <hakvoort@cvs.gnome.org>
* added detailed progressfeedback. It still needs some polishing, but * added detailed progressfeedback. It still needs some polishing, but

83
src/jfs.cc
View File

@ -18,6 +18,8 @@
#include "../include/jfs.h" #include "../include/jfs.h"
#include <cerrno>
namespace GParted namespace GParted
{ {
@ -115,7 +117,7 @@ bool jfs::Create( const Partition & new_partition, std::vector<OperationDetails>
bool jfs::Resize( const Partition & partition_new, bool jfs::Resize( const Partition & partition_new,
std::vector<OperationDetails> & operation_details, std::vector<OperationDetails> & operation_details,
bool fill_partition ) bool fill_partition )
{//FIXME (no jfs on my laptop, so couldn't test it properly) {
if ( fill_partition ) if ( fill_partition )
operation_details .push_back( OperationDetails( _("grow filesystem to fill the partition") ) ) ; operation_details .push_back( OperationDetails( _("grow filesystem to fill the partition") ) ) ;
else else
@ -125,14 +127,79 @@ bool jfs::Resize( const Partition & partition_new,
Glib::ustring error ; Glib::ustring error ;
Glib::ustring TEMP_MP = "/tmp/gparted_tmp_jfs_mountpoint" ; Glib::ustring TEMP_MP = "/tmp/gparted_tmp_jfs_mountpoint" ;
//jfs kan only grow if the partition is mounted.. //create mountpoint...
mkdir( TEMP_MP .c_str(), 0 ) ; operation_details .back() .sub_details .push_back(
if ( Utils::mount( partition_new .partition, TEMP_MP, "jfs", error ) ) OperationDetails( String::ucompose( _("create temporary mountpoint (%1)"), TEMP_MP ) ) ) ;
if ( ! mkdir( TEMP_MP .c_str(), 0 ) )
{ {
return_value = Utils::mount( partition_new .partition, TEMP_MP, "jfs", error, MS_REMOUNT, "resize" ) ; operation_details .back() .sub_details .back() .status = OperationDetails::SUCCES ;
Utils::unmount( partition_new .partition, TEMP_MP, error ) ;
//mount partition
operation_details .back() .sub_details .push_back(
OperationDetails( String::ucompose( _("mount %1 on %2"), partition_new .partition, TEMP_MP ) ) ) ;
if ( Utils::mount( partition_new .partition, TEMP_MP, "jfs", error ) )
{
operation_details .back() .sub_details .back() .status = OperationDetails::SUCCES ;
//remount the partition to resize the filesystem
operation_details .back() .sub_details .push_back(
OperationDetails( String::ucompose( _("remount %1 on %2 with the 'resize' flag enabled"),
partition_new .partition, TEMP_MP ) ) ) ;
if ( Utils::mount( partition_new .partition, TEMP_MP, "jfs", error, MS_REMOUNT, "resize" ) )
{
operation_details .back() .sub_details .back() .status = OperationDetails::SUCCES ;
//and unmount it...
operation_details .back() .sub_details .push_back(
OperationDetails( String::ucompose( _("umount %1"), partition_new .partition ) ) ) ;
if ( Utils::unmount( partition_new .partition, TEMP_MP, error ) )
{
operation_details .back() .sub_details .back() .status = OperationDetails::SUCCES ;
return_value = true ;
}
else
{
operation_details .back() .sub_details .back() .status = OperationDetails::ERROR ;
operation_details .back() .sub_details .back() .sub_details .push_back(
OperationDetails( error, OperationDetails::NONE ) ) ;
}
}
else
{
operation_details .back() .sub_details .back() .status = OperationDetails::ERROR ;
operation_details .back() .sub_details .back() .sub_details .push_back(
OperationDetails( error, OperationDetails::NONE ) ) ;
}
}
else
{
operation_details .back() .sub_details .back() .status = OperationDetails::ERROR ;
operation_details .back() .sub_details .back() .sub_details .push_back(
OperationDetails( error, OperationDetails::NONE ) ) ;
}
//remove the mountpoint..
operation_details .back() .sub_details .push_back(
OperationDetails( String::ucompose( _("remove temporary mountpoint (%1)"), TEMP_MP ) ) ) ;
if ( ! rmdir( TEMP_MP .c_str() ) )
{
operation_details .back() .sub_details .back() .status = OperationDetails::SUCCES ;
}
else
{
operation_details .back() .sub_details .back() .status = OperationDetails::ERROR ;
operation_details .back() .sub_details .back() .sub_details .push_back(
OperationDetails( Glib::strerror( errno ), OperationDetails::NONE ) ) ;
return_value = false ;
}
}
else
{
operation_details .back() .sub_details .back() .status = OperationDetails::ERROR ;
operation_details .back() .sub_details .back() .sub_details .push_back(
OperationDetails( Glib::strerror( errno ), OperationDetails::NONE ) ) ;
} }
rmdir( TEMP_MP .c_str() ) ;
operation_details .back() .status = return_value ? OperationDetails::SUCCES : OperationDetails::ERROR ; operation_details .back() .status = return_value ? OperationDetails::SUCCES : OperationDetails::ERROR ;
return return_value ; return return_value ;
@ -140,7 +207,7 @@ bool jfs::Resize( const Partition & partition_new,
bool jfs::Copy( const Glib::ustring & src_part_path, bool jfs::Copy( const Glib::ustring & src_part_path,
const Glib::ustring & dest_part_path, const Glib::ustring & dest_part_path,
std::vector<OperationDetails> & operation_details ) std::vector<OperationDetails> & operation_details )
{ {
operation_details .push_back( OperationDetails( operation_details .push_back( OperationDetails(
String::ucompose( _("copy contents of %1 to %2"), src_part_path, dest_part_path ) ) ) ; String::ucompose( _("copy contents of %1 to %2"), src_part_path, dest_part_path ) ) ) ;