Diffstat (limited to 'noncore/settings/aqpkg/ipkg.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 75 |
1 files changed, 33 insertions, 42 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 @@ -6,62 +6,55 @@ .>+-= _;:, .> :=|. This file is free software; you can .> <`_, > . <= redistribute it and/or modify it under :`=1 )Y*s>-.-- : the terms of the GNU General Public .="- .-=="i, .._ License as published by the Free Software - . .-<_> .<> Foundation; either version 2 of the License, ._= =} : or (at your option) any later version. .%`+i> _;_. .i_,=:_. -<s. This file is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; : .. .:, . . . without even the implied warranty of =_ + =;=|` MERCHANTABILITY or FITNESS FOR A _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General ..}^=.= = ; Public License for more details. ++= -. .` .: : = ...= . :.=- You should have received a copy of the GNU -. .:....=;==+<; General Public License along with this file; -_. . . )=. = see the file COPYING. If not, write to the -- :-=` Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <fstream> -#include <iostream> -#include <vector> -using namespace std; - -#include <stdio.h> -#include <unistd.h> - #ifdef QWS #include <qpe/qpeapplication.h> #else #include <qapplication.h> #endif #include <qdir.h> +#include <qfile.h> #include <qtextstream.h> #include <opie/oprocess.h> #include "utils.h" #include "ipkg.h" #include "global.h" Ipkg :: Ipkg() { proc = 0; } Ipkg :: ~Ipkg() { } // Option is what we are going to do - install, upgrade, download, reinstall // package is the package name to install - either a fully qualified path and ipk // file (if stored locally) or just the name of the package (for a network package) // packageName is the package name - (for a network package this will be the same as // package parameter) // dest is the destination alias (from ipk.conf) // destDir is the dir that the destination alias points to (used to link to root) @@ -182,121 +175,119 @@ void Ipkg :: createSymLinks() delete dependantPackages; emit outputText( tr("Finished") ); emit outputText( "" ); } void Ipkg :: removeStatusEntry() { QString statusFile = destDir; if ( statusFile.right( 1 ) != "/" ) statusFile.append( "/" ); statusFile.append( "usr/lib/ipkg/status" ); QString outStatusFile = statusFile; outStatusFile.append( ".tmp" ); emit outputText( "" ); emit outputText( tr("Removing status entry...") ); QString tempstr = tr("status file - "); tempstr.append( statusFile ); emit outputText( tempstr ); tempstr = tr("package - "); tempstr.append( package ); 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 - "); tempstr.append( statusFile ); emit outputText( tempstr ); return; } - if ( !out.is_open() ) + if ( !writeFile.open( IO_WriteOnly ) ) { tempstr = tr("Couldn't create tempory status file - "); tempstr.append( outStatusFile ); emit outputText( tempstr ); return; } - 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; + //read new line + line = readStream.readLine(); + if ( line.contains( ":", TRUE ) ) + { + //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 = ""; + } + if ( key == "Package" && value == package ) { - // Ignore all lines up to next empty - do + //skip lines from the deleted package + while ( ( !readStream.atEnd() ) && ( line.stripWhiteSpace() != "" ) ) { - in.getline( line, 1000 ); - if ( in.eof() || QString( line ).stripWhiteSpace() == "" ) - continue; - } while ( !in.eof() && QString( line ).stripWhiteSpace() != "" ); + line = readStream.readLine(); } + } else { - lines.push_back( QString( line ) ); - out << line << endl; - - // Improve UI responsiveness - i++; - if ( ( i % 50 ) == 0 ) - qApp->processEvents(); - } while ( !in.eof() ); - - // 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(); } + } - 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*/ ) { // If one is already running - should never be but just to be safe if ( proc ) { delete proc; proc = 0; } // OK we're gonna use OProcess to run this thing proc = new OProcess(); aborted = false; // Connect up our slots connect(proc, SIGNAL(processExited(OProcess *)), this, SLOT( processFinished())); |