Diffstat (limited to 'noncore/settings/aqpkg/ipkg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 103 |
1 files changed, 47 insertions, 56 deletions
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp index 43eaaae..2a9c576 100644 --- a/noncore/settings/aqpkg/ipkg.cpp +++ b/noncore/settings/aqpkg/ipkg.cpp @@ -28,12 +28,4 @@ */ -#include <fstream> -#include <iostream> -#include <vector> -using namespace std; - -#include <stdio.h> -#include <unistd.h> - #ifdef QWS #include <qpe/qpeapplication.h> @@ -42,4 +34,5 @@ using namespace std; #endif #include <qdir.h> +#include <qfile.h> #include <qtextstream.h> @@ -204,7 +197,8 @@ void Ipkg :: removeStatusEntry() emit outputText( tempstr ); - ifstream in( statusFile ); - ofstream out( outStatusFile ); - if ( !in.is_open() ) + QFile readFile( statusFile ); + QFile writeFile( outStatusFile ); + + if ( !readFile.open( IO_ReadOnly ) ) { tempstr = tr("Couldn't open status file - "); @@ -214,5 +208,5 @@ void Ipkg :: removeStatusEntry() } - if ( !out.is_open() ) + if ( !writeFile.open( IO_WriteOnly ) ) { tempstr = tr("Couldn't create tempory status file - "); @@ -222,64 +216,61 @@ void Ipkg :: removeStatusEntry() } - char line[1001]; + int i = 0; + + QTextStream readStream( &readFile ); + QTextStream writeStream( &writeFile ); + QString line; + char k[21]; char v[1001]; QString key; QString value; - vector<QString> lines; - int i = 0; - do + + while ( !readStream.atEnd() ) { - in.getline( line, 1000 ); - if ( in.eof() ) - continue; - - k[0] = '\0'; - v[0] = '\0'; - - sscanf( line, "%[^:]: %[^\n]", k, v ); - key = k; - value = v; - key = key.stripWhiteSpace(); - value = value.stripWhiteSpace(); - if ( key == "Package" && value == package ) + //read new line + line = readStream.readLine(); + + if ( line.contains( ":", TRUE ) ) { - // Ignore all lines up to next empty - do - { - in.getline( line, 1000 ); - if ( in.eof() || QString( line ).stripWhiteSpace() == "" ) - continue; - } while ( !in.eof() && QString( line ).stripWhiteSpace() != "" ); + //grep key and value from line + k[0] = '\0'; + v[0] = '\0'; + sscanf( line, "%[^:]: %[^\n]", k, v ); + key = k; + value = v; + key = key.stripWhiteSpace(); + value = value.stripWhiteSpace(); + } else { + key = ""; + value = ""; } - lines.push_back( QString( line ) ); - out << line << endl; - - // Improve UI responsiveness - i++; - if ( ( i % 50 ) == 0 ) - qApp->processEvents(); - } while ( !in.eof() ); + if ( key == "Package" && value == package ) + { + //skip lines from the deleted package + while ( ( !readStream.atEnd() ) && ( line.stripWhiteSpace() != "" ) ) + { + line = readStream.readLine(); + } + } else { - // Write lines out - vector<QString>::iterator it; - for ( it = lines.begin() ; it != lines.end() ; ++it ) - { - out << (const char *)(*it) << endl; + //write other lines into the tempfile + writeStream << line << "\n"; - // Improve UI responsiveness - i++; - if ( ( i % 50 ) == 0 ) - qApp->processEvents(); + // Improve UI responsiveness + i++; + if ( ( i % 50 ) == 0 ) + qApp->processEvents(); + } } - in.close(); - out.close(); + readFile.close(); + writeFile.close(); // Remove old status file and put tmp stats file in its place remove( statusFile ); rename( outStatusFile, statusFile ); -} + } int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ ) |