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

when the libary of an optional filesystem (atm only reiserfs) wasn't 

* src/Device.cc: when the libary of an optional filesystem (atm only reiserfs) wasn't installed, every scan printed an error
in the console (df couldn't find the partition listed). Fixed by checking if partition is busy before using df.
This commit is contained in:
Bart Hakvoort 2004-10-16 20:27:28 +00:00
parent 58cb2ad6ec
commit d127dfa983
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-10-16 Bart Hakvoort <gparted@users.sf.net>
* src/Device.cc: when the libary of an optional filesystem (atm only reiserfs) wasn't installed, every scan printed an error
in the console (df couldn't find the partition listed). Fixed by checking if partition is busy before using df.
2004-10-16 Bart Hakvoort <gparted@users.sf.net> 2004-10-16 Bart Hakvoort <gparted@users.sf.net>
* src/Dialog_Progress.cc: changed dialogwidth from 500 to 600 pixels. (icw certain languages the operation didn't fit) * src/Dialog_Progress.cc: changed dialogwidth from 500 to 600 pixels. (icw certain languages the operation didn't fit)

25
src/Device.cc
View File

@ -539,19 +539,22 @@ Sector Device::Get_Used_Sectors( PedPartition *c_partition, const Glib::ustring
//METHOD #2 //METHOD #2
//this ony works for mounted ( and therefore known to the OS ) filesystems. My method is quite crude, keep in mind it's only temporary ;-) //this ony works for mounted ( and therefore known to the OS ) filesystems. My method is quite crude, keep in mind it's only temporary ;-)
Glib::ustring buf; if ( ped_partition_is_busy( c_partition ) )
system( ("df -k --sync " + sym_path + " | grep " + sym_path + " > /tmp/.tmp_gparted").c_str() ); {
std::ifstream file_input( "/tmp/.tmp_gparted" ); Glib::ustring buf;
system( ("df -k --sync " + sym_path + " | grep " + sym_path + " > /tmp/.tmp_gparted").c_str() );
file_input >> buf; //skip first value std::ifstream file_input( "/tmp/.tmp_gparted" );
file_input >> buf;
if ( buf != "0" && ! buf.empty() ) file_input >> buf; //skip first value
{
file_input >> buf; file_input >> buf;
file_input.close(); system( "rm -f /tmp/.tmp_gparted" ); if ( buf != "0" && ! buf.empty() )
return atoi( buf.c_str() ) * 1024/512 ; {
file_input >> buf;
file_input.close(); system( "rm -f /tmp/.tmp_gparted" );
return atoi( buf.c_str() ) * 1024/512 ;
}
file_input.close(); system( "rm -f /tmp/.tmp_gparted" );
} }
file_input.close(); system( "rm -f /tmp/.tmp_gparted" );
return -1 ; //all methods were unsuccesfull return -1 ; //all methods were unsuccesfull