fixed a couple of issues with reading of volumelabels (#338528)
* src/ext2.cc, src/ext3.cc: fixed a couple of issues with reading of volumelabels (#338528)
This commit is contained in:
parent
65b06599d4
commit
8963a49c42
|
@ -1,3 +1,9 @@
|
||||||
|
2006-09-14 Bart Hakvoort <hakvoort@cvs.gnome.org>
|
||||||
|
|
||||||
|
* src/ext2.cc,
|
||||||
|
src/ext3.cc: fixed a couple of issues with reading of volumelabels
|
||||||
|
(#338528)
|
||||||
|
|
||||||
2006-09-13 Bart Hakvoort <hakvoort@cvs.gnome.org>
|
2006-09-13 Bart Hakvoort <hakvoort@cvs.gnome.org>
|
||||||
|
|
||||||
* include/GParted_Core.h,
|
* include/GParted_Core.h,
|
||||||
|
|
|
@ -88,7 +88,7 @@ void ext2::get_label( Partition & partition )
|
||||||
if ( output .size() > 0 && output[ output .size() -1 ] == '\n' )
|
if ( output .size() > 0 && output[ output .size() -1 ] == '\n' )
|
||||||
partition .label = output .substr( 0, output .size() -1 ) ;
|
partition .label = output .substr( 0, output .size() -1 ) ;
|
||||||
else
|
else
|
||||||
partition .label + output ;
|
partition .label = output ;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -29,6 +29,9 @@ FS ext3::get_filesystem_support()
|
||||||
if ( ! Glib::find_program_in_path( "dumpe2fs" ) .empty() )
|
if ( ! Glib::find_program_in_path( "dumpe2fs" ) .empty() )
|
||||||
fs .read = GParted::FS::EXTERNAL ;
|
fs .read = GParted::FS::EXTERNAL ;
|
||||||
|
|
||||||
|
if ( ! Glib::find_program_in_path( "e2label" ) .empty() )
|
||||||
|
fs .get_label = FS::EXTERNAL ;
|
||||||
|
|
||||||
if ( ! Glib::find_program_in_path( "mkfs.ext3" ) .empty() )
|
if ( ! Glib::find_program_in_path( "mkfs.ext3" ) .empty() )
|
||||||
fs .create = GParted::FS::EXTERNAL ;
|
fs .create = GParted::FS::EXTERNAL ;
|
||||||
|
|
||||||
|
@ -86,7 +89,7 @@ void ext3::get_label( Partition & partition )
|
||||||
if ( output .size() > 0 && output[ output .size() -1 ] == '\n' )
|
if ( output .size() > 0 && output[ output .size() -1 ] == '\n' )
|
||||||
partition .label = output .substr( 0, output .size() -1 ) ;
|
partition .label = output .substr( 0, output .size() -1 ) ;
|
||||||
else
|
else
|
||||||
partition .label + output ;
|
partition .label = output ;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue