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

replaced ntfscluster with ntfsresize (see #350789) 

* src/ntfs.cc: replaced ntfscluster with ntfsresize (see #350789)
This commit is contained in:
Bart Hakvoort 2006-08-27 12:05:05 +00:00
parent d23ca9d8ea
commit 9d956594d6
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2006-08-27 Bart Hakvoort <hakvoort@cvs.gnome.org>
* src/ntfs.cc: replaced ntfscluster with ntfsresize (see #350789)
2006-08-27 Bart Hakvoort <hakvoort@cvs.gnome.org> 2006-08-27 Bart Hakvoort <hakvoort@cvs.gnome.org>
* happy 24th birthday Johannes! :^) * happy 24th birthday Johannes! :^)

25
src/ntfs.cc
View File

@ -25,18 +25,18 @@ FS ntfs::get_filesystem_support()
{ {
FS fs ; FS fs ;
fs .filesystem = GParted::FS_NTFS ; fs .filesystem = GParted::FS_NTFS ;
if ( ! Glib::find_program_in_path( "ntfscluster" ) .empty() ) if ( ! Glib::find_program_in_path( "ntfsresize" ) .empty() )
{
fs .read = GParted::FS::EXTERNAL ; fs .read = GParted::FS::EXTERNAL ;
fs .check = GParted::FS::EXTERNAL ;
}
if ( ! Glib::find_program_in_path( "mkntfs" ) .empty() ) if ( ! Glib::find_program_in_path( "mkntfs" ) .empty() )
fs .create = GParted::FS::EXTERNAL ; fs .create = GParted::FS::EXTERNAL ;
if ( ! Glib::find_program_in_path( "ntfsfix" ) .empty() )
fs .check = GParted::FS::EXTERNAL ;
//resizing is a delicate process ... //resizing is a delicate process ...
if ( ! Glib::find_program_in_path( "ntfsresize" ) .empty() && fs .check ) if ( fs .read && fs .check )
{ {
fs .grow = GParted::FS::EXTERNAL ; fs .grow = GParted::FS::EXTERNAL ;
@ -56,15 +56,16 @@ FS ntfs::get_filesystem_support()
void ntfs::set_used_sectors( Partition & partition ) void ntfs::set_used_sectors( Partition & partition )
{ {
if ( ! Utils::execute_command( "ntfscluster --force " + partition .get_path(), output, error, true ) ) if ( ! Utils::execute_command(
"ntfsresize --info --force --no-progress-bar " + partition .get_path(), output, error, true ) )
{ {
index = output .find( "sectors of free space" ) ; index = output .find( "resize at" ) ;
if ( index >= output .length() || if ( index >= output .length() ||
sscanf( output .substr( index ) .c_str(), "sectors of free space : %Ld", &N ) != 1 ) sscanf( output .substr( index ) .c_str(), "resize at %Ld", &N ) != 1 )
N = -1 ; N = -1 ;
if ( N > -1 ) if ( N > -1 )
partition .Set_Unused( N ) ; partition .set_used( Utils::round( N / 512.0 ) ) ;
} }
else else
partition .messages .push_back( error ) ; partition .messages .push_back( error ) ;