Cleanup white space in read_mountpoints_from_file method

This commit is contained in:
Curtis Gedak 2009-07-08 14:23:32 -06:00
parent 98f7470b25
commit ae912379cc
1 changed files with 9 additions and 8 deletions

View File

@ -629,13 +629,14 @@ void GParted_Core::init_maps()
} }
} }
void GParted_Core::read_mountpoints_from_file( const Glib::ustring & filename, void GParted_Core::read_mountpoints_from_file(
std::map< Glib::ustring, std::vector<Glib::ustring> > & map ) const Glib::ustring & filename,
std::map< Glib::ustring, std::vector<Glib::ustring> > & map )
{ {
std::string line ; std::string line ;
char node[4096+1], mountpoint[4096+1] ; char node[4096+1], mountpoint[4096+1] ;
unsigned int index ; unsigned int index ;
std::ifstream file( filename .c_str() ) ; std::ifstream file( filename .c_str() ) ;
if ( file ) if ( file )
{ {
@ -645,17 +646,17 @@ void GParted_Core::read_mountpoints_from_file( const Glib::ustring & filename,
Glib::ustring( node ) != "/dev/root" ) Glib::ustring( node ) != "/dev/root" )
{ {
line = mountpoint ; line = mountpoint ;
//see if mount point contains spaces and deal with it //see if mount point contains spaces and deal with it
index = line .find( "\\040" ) ; index = line .find( "\\040" ) ;
if ( index < line .length() ) if ( index < line .length() )
line .replace( index, 4, " " ) ; line .replace( index, 4, " " ) ;
//only add this path if it exists //only add this path if it exists
if ( file_test( line, Glib::FILE_TEST_EXISTS ) ) if ( file_test( line, Glib::FILE_TEST_EXISTS ) )
map[ node ] .push_back( line ) ; map[ node ] .push_back( line ) ;
} }
file .close() ; file .close() ;
} }
} }