From 8963a49c42e90dd84c5418cf12803883872280b5 Mon Sep 17 00:00:00 2001 From: Bart Hakvoort Date: Thu, 14 Sep 2006 16:42:02 +0000 Subject: [PATCH] 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) --- ChangeLog | 6 ++++++ src/ext2.cc | 2 +- src/ext3.cc | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a09b0a5..8a75afb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-09-14 Bart Hakvoort + + * src/ext2.cc, + src/ext3.cc: fixed a couple of issues with reading of volumelabels + (#338528) + 2006-09-13 Bart Hakvoort * include/GParted_Core.h, diff --git a/src/ext2.cc b/src/ext2.cc index 0a2c0ca5..b515df1b 100644 --- a/src/ext2.cc +++ b/src/ext2.cc @@ -88,7 +88,7 @@ void ext2::get_label( Partition & partition ) if ( output .size() > 0 && output[ output .size() -1 ] == '\n' ) partition .label = output .substr( 0, output .size() -1 ) ; else - partition .label + output ; + partition .label = output ; } else { diff --git a/src/ext3.cc b/src/ext3.cc index 596c9ad4..02d2fdde 100644 --- a/src/ext3.cc +++ b/src/ext3.cc @@ -28,6 +28,9 @@ FS ext3::get_filesystem_support() if ( ! Glib::find_program_in_path( "dumpe2fs" ) .empty() ) 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() ) fs .create = GParted::FS::EXTERNAL ; @@ -86,7 +89,7 @@ void ext3::get_label( Partition & partition ) if ( output .size() > 0 && output[ output .size() -1 ] == '\n' ) partition .label = output .substr( 0, output .size() -1 ) ; else - partition .label + output ; + partition .label = output ; } else {