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

Enhance file parsing to handle tabs properly (#582687) 

Previously the read_mountpoints_from_file() method only expected
a space between arguments in files such as /etc/fstab.  Valid
delimiters are now space and tab.

Related to GParted bug #582687
This commit is contained in:
Curtis Gedak 2009-07-23 16:03:42 -06:00
parent ae912379cc
commit 5f3c806561
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/GParted_Core.cc
View File

@ -634,27 +634,27 @@ void GParted_Core::read_mountpoints_from_file(
std::map< Glib::ustring, std::vector<Glib::ustring> > & map )
{
std::string line ;
char node[4096+1], mountpoint[4096+1] ;
unsigned int index ;
Glib::ustring node ;
Glib::ustring mountpoint ;
std::ifstream file( filename .c_str() ) ;
if ( file )
{
while ( getline( file, line ) )
if ( Glib::str_has_prefix( line, "/" ) &&
sscanf( line .c_str(), "%4096s %4096s", node, mountpoint ) == 2 &&
Glib::ustring( node ) != "/dev/root" )
{
line = mountpoint ;
//see if mount point contains spaces and deal with it
index = line .find( "\\040" ) ;
if ( index < line .length() )
line .replace( index, 4, " " ) ;
node = Utils::regexp_label( line, "^(/[^ \t]+)[ \t]+[^ \t]+" ) ;
mountpoint = Utils::regexp_label( line, "^/[^ \t]+[ \t]+([^ \t]+)" ) ;
if ( mountpoint .length() > 0 &&
node .length() > 0 &&
node != "/dev/root" )
{
//only add this path if it exists
if ( file_test( line, Glib::FILE_TEST_EXISTS ) )
map[ node ] .push_back( line ) ;
if ( file_test( mountpoint, Glib::FILE_TEST_EXISTS ) )
{
map[ node ] .push_back( mountpoint ) ;
//FIXME: Should check if file is a symbolic link. If so then find real path
}
}
}
file .close() ;