diff --git a/include/Makefile.am b/include/Makefile.am index 7a8f1df1..98a227c1 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -40,8 +40,6 @@ EXTRA_DIST = \ btrfs.h \ exfat.h \ ext2.h \ - ext3.h \ - ext4.h \ fat16.h \ fat32.h \ hfs.h \ diff --git a/include/ext2.h b/include/ext2.h index 6b76d627..8d4f9dc5 100644 --- a/include/ext2.h +++ b/include/ext2.h @@ -27,7 +27,9 @@ namespace GParted class ext2 : public FileSystem { + const enum FILESYSTEM specific_type; public: + ext2( enum FILESYSTEM type ) : specific_type( type ) {}; FS get_filesystem_support() ; void set_used_sectors( Partition & partition ) ; void read_label( Partition & partition ) ; diff --git a/include/ext3.h b/include/ext3.h deleted file mode 100644 index 18eb16b1..00000000 --- a/include/ext3.h +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright (C) 2004 Bart - * Copyright (C) 2008, 2009, 2010 Curtis Gedak - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - - -#ifndef DEFINE_EXT3 -#define DEFINE_EXT3 - -#include "../include/FileSystem.h" - -namespace GParted -{ - -class ext3 : public FileSystem -{ -public: - FS get_filesystem_support() ; - void set_used_sectors( Partition & partition ) ; - void read_label( Partition & partition ) ; - bool write_label( const Partition & partition, OperationDetail & operationdetail ) ; - void read_uuid( Partition & partition ) ; - bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) ; - bool create( const Partition & new_partition, OperationDetail & operationdetail ) ; - bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ; - bool move( const Partition & partition_new - , const Partition & partition_old - , OperationDetail & operationdetail - ) ; - bool copy( const Glib::ustring & src_part_path, - const Glib::ustring & dest_part_path, - OperationDetail & operationdetail ) ; - bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ; - bool remove( const Partition & partition, OperationDetail & operationdetail ) ; -}; - - -} //GParted - -#endif //EXT3 diff --git a/include/ext4.h b/include/ext4.h deleted file mode 100644 index 004c09c2..00000000 --- a/include/ext4.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright (C) 2008, 2009, 2010 Curtis Gedak - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - - -#ifndef EXT4_H_ -#define EXT4_H_ - -#include "../include/FileSystem.h" - -namespace GParted -{ - -class ext4 : public FileSystem -{ -public: - FS get_filesystem_support() ; - void set_used_sectors( Partition & partition ) ; - void read_label( Partition & partition ) ; - bool write_label( const Partition & partition, OperationDetail & operationdetail ) ; - void read_uuid( Partition & partition ) ; - bool write_uuid( const Partition & partition, OperationDetail & operationdetail ) ; - bool create( const Partition & new_partition, OperationDetail & operationdetail ) ; - bool resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition = false ) ; - bool move( const Partition & partition_new - , const Partition & partition_old - , OperationDetail & operationdetail - ) ; - bool copy( const Glib::ustring & src_part_path, - const Glib::ustring & dest_part_path, - OperationDetail & operationdetail ) ; - bool check_repair( const Partition & partition, OperationDetail & operationdetail ) ; - bool remove( const Partition & partition, OperationDetail & operationdetail ) ; -}; - - -} //GParted - -#endif /*EXT4_H_*/ diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc index 41b1873a..53f880f3 100644 --- a/src/GParted_Core.cc +++ b/src/GParted_Core.cc @@ -33,8 +33,6 @@ #include "../include/btrfs.h" #include "../include/exfat.h" #include "../include/ext2.h" -#include "../include/ext3.h" -#include "../include/ext4.h" #include "../include/fat16.h" #include "../include/fat32.h" #include "../include/linux_swap.h" @@ -100,9 +98,9 @@ void GParted_Core::find_supported_filesystems() FILESYSTEM_MAP[ FS_BTRFS ] = new btrfs() ; FILESYSTEM_MAP[ FS_EXFAT ] = new exfat() ; - FILESYSTEM_MAP[ FS_EXT2 ] = new ext2() ; - FILESYSTEM_MAP[ FS_EXT3 ] = new ext3() ; - FILESYSTEM_MAP[ FS_EXT4 ] = new ext4() ; + FILESYSTEM_MAP[ FS_EXT2 ] = new ext2( FS_EXT2 ) ; + FILESYSTEM_MAP[ FS_EXT3 ] = new ext2( FS_EXT3 ) ; + FILESYSTEM_MAP[ FS_EXT4 ] = new ext2( FS_EXT4 ) ; FILESYSTEM_MAP[ FS_FAT16 ] = new fat16() ; FILESYSTEM_MAP[ FS_FAT32 ] = new fat32() ; FILESYSTEM_MAP[ FS_HFS ] = new hfs() ; diff --git a/src/Makefile.am b/src/Makefile.am index 16c02772..28feb634 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -50,8 +50,6 @@ gpartedbin_SOURCES = \ btrfs.cc \ exfat.cc \ ext2.cc \ - ext3.cc \ - ext4.cc \ fat16.cc \ fat32.cc \ hfs.cc \ diff --git a/src/ext2.cc b/src/ext2.cc index 2f113b5c..02519030 100644 --- a/src/ext2.cc +++ b/src/ext2.cc @@ -24,42 +24,48 @@ namespace GParted FS ext2::get_filesystem_support() { FS fs ; - fs .filesystem = FS_EXT2 ; + fs .filesystem = specific_type; - if ( ! Glib::find_program_in_path( "dumpe2fs" ) .empty() ) - fs .read = FS::EXTERNAL ; - - if ( ! Glib::find_program_in_path( "tune2fs" ) .empty() ) { - fs .read_uuid = FS::EXTERNAL ; - fs .write_uuid = FS::EXTERNAL ; - } - - if ( ! Glib::find_program_in_path( "e2label" ) .empty() ) { - fs .read_label = FS::EXTERNAL ; - fs .write_label = FS::EXTERNAL ; - } - - if ( ! Glib::find_program_in_path( "mkfs.ext2" ) .empty() ) + //Only enable any functionality if the relevant mkfs.extX command is + // found to ensure that the version of e2fsprogs is new enough to + // support ext4. Applying to ext2/3 too is OK as relevant mkfs.ext2/3 + // commands exist. + if ( ! Glib::find_program_in_path( "mkfs." + Utils::get_filesystem_string( specific_type ) ).empty() ) + { fs .create = FS::EXTERNAL ; - - if ( ! Glib::find_program_in_path( "e2fsck" ) .empty() ) - fs .check = FS::EXTERNAL ; - - if ( ! Glib::find_program_in_path( "resize2fs" ) .empty() && fs .check ) - { - fs .grow = FS::EXTERNAL ; - - if ( fs .read ) //needed to determine a min file system size.. - fs .shrink = FS::EXTERNAL ; - } - if ( fs .check ) - { - fs .copy = FS::GPARTED ; - fs .move = FS::GPARTED ; - } + if ( ! Glib::find_program_in_path( "dumpe2fs" ) .empty() ) + fs .read = FS::EXTERNAL ; - fs .online_read = FS::EXTERNAL ; + if ( ! Glib::find_program_in_path( "tune2fs" ) .empty() ) { + fs .read_uuid = FS::EXTERNAL ; + fs .write_uuid = FS::EXTERNAL ; + } + + if ( ! Glib::find_program_in_path( "e2label" ) .empty() ) { + fs .read_label = FS::EXTERNAL ; + fs .write_label = FS::EXTERNAL ; + } + + if ( ! Glib::find_program_in_path( "e2fsck" ) .empty() ) + fs .check = FS::EXTERNAL ; + + if ( ! Glib::find_program_in_path( "resize2fs" ) .empty() && fs .check ) + { + fs .grow = FS::EXTERNAL ; + + if ( fs .read ) //needed to determine a min file system size.. + fs .shrink = FS::EXTERNAL ; + } + + if ( fs .check ) + { + fs .copy = FS::GPARTED ; + fs .move = FS::GPARTED ; + } + + fs .online_read = FS::EXTERNAL ; + } return fs ; } @@ -167,8 +173,8 @@ bool ext2::write_uuid( const Partition & partition, OperationDetail & operationd bool ext2::create( const Partition & new_partition, OperationDetail & operationdetail ) { - return ! execute_command( "mkfs.ext2 -L \"" + - new_partition.get_label() + "\" " + new_partition.get_path(), + return ! execute_command( "mkfs." + Utils::get_filesystem_string( specific_type ) + + " -L \"" + new_partition.get_label() + "\" " + new_partition.get_path(), operationdetail, false, true ); diff --git a/src/ext3.cc b/src/ext3.cc deleted file mode 100644 index 51ef51aa..00000000 --- a/src/ext3.cc +++ /dev/null @@ -1,215 +0,0 @@ -/* Copyright (C) 2004 Bart - * Copyright (C) 2008, 2009, 2010, 2011 Curtis Gedak - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - - -#include "../include/ext3.h" - -namespace GParted -{ - -FS ext3::get_filesystem_support() -{ - FS fs ; - fs .filesystem = GParted::FS_EXT3 ; - - if ( ! Glib::find_program_in_path( "dumpe2fs" ) .empty() ) - fs .read = GParted::FS::EXTERNAL ; - - if ( ! Glib::find_program_in_path( "tune2fs" ) .empty() ) { - fs .read_uuid = FS::EXTERNAL ; - fs .write_uuid = FS::EXTERNAL ; - } - - if ( ! Glib::find_program_in_path( "e2label" ) .empty() ) { - fs .read_label = FS::EXTERNAL ; - fs .write_label = FS::EXTERNAL ; - } - - if ( ! Glib::find_program_in_path( "mkfs.ext3" ) .empty() ) - fs .create = GParted::FS::EXTERNAL ; - - if ( ! Glib::find_program_in_path( "e2fsck" ) .empty() ) - fs .check = GParted::FS::EXTERNAL ; - - if ( ! Glib::find_program_in_path( "resize2fs" ) .empty() && fs .check ) - { - fs .grow = GParted::FS::EXTERNAL ; - - if ( fs .read ) //needed to determine a min file system size.. - fs .shrink = GParted::FS::EXTERNAL ; - } - - if ( fs .check ) - { - fs .copy = GParted::FS::GPARTED ; - fs .move = GParted::FS::GPARTED ; - } - - fs .online_read = FS::EXTERNAL ; - - return fs ; -} - -void ext3::set_used_sectors( Partition & partition ) -{ - //Called when file system is unmounted *and* when mounted. Always read - // the file system size from the on disk superblock using dumpe2fs to - // avoid overhead subtraction. Read the free space from the kernel via - // the statvfs() system call when mounted and from the superblock when - // unmounted. - if ( ! Utils::execute_command( "dumpe2fs -h " + partition .get_path(), output, error, true ) ) - { - index = output .find( "Block count: " ) ; - if ( index >= output .length() || - sscanf( output .substr( index ) .c_str(), "Block count: %Ld", &T ) != 1 ) - T = -1 ; - - index = output .find( "Block size:" ) ; - if ( index >= output.length() || - sscanf( output.substr( index ) .c_str(), "Block size: %Ld", &S ) != 1 ) - S = -1 ; - - if ( T > -1 && S > -1 ) - T = Utils::round( T * ( S / double(partition .sector_size) ) ) ; - - if ( partition .busy ) - { - Byte_Value ignored ; - Byte_Value fs_free ; - if ( Utils::get_mounted_filesystem_usage( partition .get_mountpoint(), - ignored, fs_free, error ) == 0 ) - N = Utils::round( fs_free / double(partition .sector_size) ) ; - else - { - N = -1 ; - partition .messages .push_back( error ) ; - } - } - else - { - index = output .find( "Free blocks:" ) ; - if ( index >= output .length() || - sscanf( output.substr( index ) .c_str(), "Free blocks: %Ld", &N ) != 1 ) - N = -1 ; - - if ( N > -1 && S > -1 ) - N = Utils::round( N * ( S / double(partition .sector_size) ) ) ; - } - - if ( T > -1 && N > -1 ) - partition .set_sector_usage( T, N ) ; - } - else - { - if ( ! output .empty() ) - partition .messages .push_back( output ) ; - - if ( ! error .empty() ) - partition .messages .push_back( error ) ; - } -} - -void ext3::read_label( Partition & partition ) -{ - if ( ! Utils::execute_command( "e2label " + partition .get_path(), output, error, true ) ) - { - partition .set_label( Utils::trim( output ) ) ; - } - else - { - if ( ! output .empty() ) - partition .messages .push_back( output ) ; - - if ( ! error .empty() ) - partition .messages .push_back( error ) ; - } -} - -bool ext3::write_label( const Partition & partition, OperationDetail & operationdetail ) -{ - return ! execute_command( "e2label " + partition .get_path() + " \"" + partition .get_label() + "\"", operationdetail ) ; -} - -void ext3::read_uuid( Partition & partition ) -{ - if ( ! Utils::execute_command( "tune2fs -l " + partition .get_path(), output, error, true ) ) - { - partition .uuid = Utils::regexp_label( output, "^Filesystem UUID:[[:blank:]]*(" RFC4122_NONE_NIL_UUID_REGEXP ")" ) ; - } - else - { - if ( ! output .empty() ) - partition .messages .push_back( output ) ; - - if ( ! error .empty() ) - partition .messages .push_back( error ) ; - } -} - -bool ext3::write_uuid( const Partition & partition, OperationDetail & operationdetail ) -{ - return ! execute_command( "tune2fs -U random " + partition .get_path(), operationdetail ) ; -} - -bool ext3::create( const Partition & new_partition, OperationDetail & operationdetail ) -{ - return ! execute_command( "mkfs.ext3 -L \"" + new_partition .get_label() + "\" " + new_partition .get_path(), operationdetail ) ; -} - -bool ext3::resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition ) -{ - Glib::ustring str_temp = "resize2fs " + partition_new .get_path() ; - - if ( ! fill_partition ) - str_temp += " " + Utils::num_to_str( Utils::round( Utils::sector_to_unit( - partition_new .get_sector_length(), partition_new .sector_size, UNIT_KIB ) ) -1 ) + "K" ; - - return ! execute_command( str_temp, operationdetail ) ; -} - -bool ext3::move( const Partition & partition_new - , const Partition & partition_old - , OperationDetail & operationdetail - ) -{ - return true ; -} - -bool ext3::copy( const Glib::ustring & src_part_path, - const Glib::ustring & dest_part_path, - OperationDetail & operationdetail ) -{ - return true ; -} - -bool ext3::check_repair( const Partition & partition, OperationDetail & operationdetail ) -{ - exit_status = execute_command( "e2fsck -f -y -v " + partition .get_path(), operationdetail ) ; - - //exitstatus 256 isn't documented, but it's returned when the 'FILE SYSTEM IS MODIFIED' - //this is quite normal (especially after a copy) so we let the function return true... - return ( exit_status == 0 || exit_status == 1 || exit_status == 2 || exit_status == 256 ) ; -} - -bool ext3::remove( const Partition & partition, OperationDetail & operationdetail ) -{ - return true ; -} - -} //GParted - diff --git a/src/ext4.cc b/src/ext4.cc deleted file mode 100644 index 99f3d587..00000000 --- a/src/ext4.cc +++ /dev/null @@ -1,217 +0,0 @@ -/* Copyright (C) 2008, 2009, 2010, 2011 Curtis Gedak - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - - -#include "../include/ext4.h" - -namespace GParted -{ - -FS ext4::get_filesystem_support() -{ - FS fs ; - fs .filesystem = GParted::FS_EXT4 ; - - //To be on the safe side, only enable all the function if mkfs.ext4 is - // found indicating that there is a recent copy of e2fsprogs available. - if ( ! Glib::find_program_in_path( "mkfs.ext4" ) .empty() ) - { - fs .create = GParted::FS::EXTERNAL ; - - if ( ! Glib::find_program_in_path( "dumpe2fs" ) .empty() ) - fs .read = GParted::FS::EXTERNAL ; - - if ( ! Glib::find_program_in_path( "tune2fs" ) .empty() ) { - fs .read_uuid = FS::EXTERNAL ; - fs .write_uuid = FS::EXTERNAL ; - } - - if ( ! Glib::find_program_in_path( "e2label" ) .empty() ) { - fs .read_label = FS::EXTERNAL ; - fs .write_label = FS::EXTERNAL ; - } - - if ( ! Glib::find_program_in_path( "e2fsck" ) .empty() ) - fs .check = GParted::FS::EXTERNAL ; - - if ( ! Glib::find_program_in_path( "resize2fs" ) .empty() && fs .check ) - { - fs .grow = GParted::FS::EXTERNAL ; - - if ( fs .read ) //needed to determine a min file system size.. - fs .shrink = GParted::FS::EXTERNAL ; - } - - if ( fs .check ) - { - fs .copy = GParted::FS::GPARTED ; - fs .move = GParted::FS::GPARTED ; - } - } - - fs .online_read = FS::EXTERNAL ; - - return fs ; -} - -void ext4::set_used_sectors( Partition & partition ) -{ - //Called when file system is unmounted *and* when mounted. Always read - // the file system size from the on disk superblock using dumpe2fs to - // avoid overhead subtraction. Read the free space from the kernel via - // the statvfs() system call when mounted and from the superblock when - // unmounted. - if ( ! Utils::execute_command( "dumpe2fs -h " + partition .get_path(), output, error, true ) ) - { - index = output .find( "Block count:" ) ; - if ( index >= output .length() || - sscanf( output.substr( index ) .c_str(), "Block count: %Ld", &T ) != 1 ) - T = -1 ; - - index = output .find( "Block size:" ) ; - if ( index >= output.length() || - sscanf( output.substr( index ) .c_str(), "Block size: %Ld", &S ) != 1 ) - S = -1 ; - - if ( T > -1 && S > -1 ) - T = Utils::round( T * ( S / double(partition .sector_size) ) ) ; - - if ( partition .busy ) - { - Byte_Value ignored ; - Byte_Value fs_free ; - if ( Utils::get_mounted_filesystem_usage( partition .get_mountpoint(), - ignored, fs_free, error ) == 0 ) - N = Utils::round( fs_free / double(partition .sector_size) ) ; - else - { - N = -1 ; - partition .messages .push_back( error ) ; - } - } - else - { - index = output .find( "Free blocks:" ) ; - if ( index >= output .length() || - sscanf( output.substr( index ) .c_str(), "Free blocks: %Ld", &N ) != 1 ) - N = -1 ; - - if ( N > -1 && S > -1 ) - N = Utils::round( N * ( S / double(partition .sector_size) ) ) ; - } - - if ( T > -1 && N > -1 ) - partition .set_sector_usage( T, N ) ; - } - else - { - if ( ! output .empty() ) - partition .messages .push_back( output ) ; - - if ( ! error .empty() ) - partition .messages .push_back( error ) ; - } -} - -void ext4::read_label( Partition & partition ) -{ - if ( ! Utils::execute_command( "e2label " + partition .get_path(), output, error, true ) ) - { - partition .set_label( Utils::trim( output ) ) ; - } - else - { - if ( ! output .empty() ) - partition .messages .push_back( output ) ; - - if ( ! error .empty() ) - partition .messages .push_back( error ) ; - } -} - -bool ext4::write_label( const Partition & partition, OperationDetail & operationdetail ) -{ - return ! execute_command( "e2label " + partition .get_path() + " \"" + partition .get_label() + "\"", operationdetail ) ; -} - -void ext4::read_uuid( Partition & partition ) -{ - if ( ! Utils::execute_command( "tune2fs -l " + partition .get_path(), output, error, true ) ) - { - partition .uuid = Utils::regexp_label( output, "^Filesystem UUID:[[:blank:]]*(" RFC4122_NONE_NIL_UUID_REGEXP ")" ) ; - } - else - { - if ( ! output .empty() ) - partition .messages .push_back( output ) ; - - if ( ! error .empty() ) - partition .messages .push_back( error ) ; - } -} - -bool ext4::write_uuid( const Partition & partition, OperationDetail & operationdetail ) -{ - return ! execute_command( "tune2fs -U random " + partition .get_path(), operationdetail ) ; -} - -bool ext4::create( const Partition & new_partition, OperationDetail & operationdetail ) -{ - return ! execute_command( "mkfs.ext4 -j -O extent -L \"" + new_partition .get_label() + "\" " + new_partition .get_path(), operationdetail ) ; -} - -bool ext4::resize( const Partition & partition_new, OperationDetail & operationdetail, bool fill_partition ) -{ - Glib::ustring str_temp = "resize2fs " + partition_new .get_path() ; - - if ( ! fill_partition ) - str_temp += " " + Utils::num_to_str( Utils::round( Utils::sector_to_unit( - partition_new .get_sector_length(), partition_new .sector_size, UNIT_KIB ) ) -1 ) + "K" ; - - return ! execute_command( str_temp, operationdetail ) ; -} - -bool ext4::move( const Partition & partition_new - , const Partition & partition_old - , OperationDetail & operationdetail - ) -{ - return true ; -} - -bool ext4::copy( const Glib::ustring & src_part_path, - const Glib::ustring & dest_part_path, - OperationDetail & operationdetail ) -{ - return true ; -} - -bool ext4::check_repair( const Partition & partition, OperationDetail & operationdetail ) -{ - exit_status = execute_command( "e2fsck -f -y -v " + partition .get_path(), operationdetail ) ; - - //exitstatus 256 isn't documented, but it's returned when the 'FILE SYSTEM IS MODIFIED' - //this is quite normal (especially after a copy) so we let the function return true... - return ( exit_status == 0 || exit_status == 1 || exit_status == 2 || exit_status == 256 ) ; -} - -bool ext4::remove( const Partition & partition, OperationDetail & operationdetail ) -{ - return true ; -} - -} //GParted