Added abort functionality

2 files changed, 24 insertions, 0 deletions

diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index 407abe9..7afe04f 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -30,24 +30,25 @@ using namespace std;
 #endif
 #include <qdir.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)
@@ -128,24 +129,27 @@ bool Ipkg :: runIpkg( )
             emit outputText( QString( "Removing symbolic links...\n" ) );
             linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir );
             emit outputText( QString( " " ) );
         }
     }
     
     // Execute command
     dependantPackages = new QList<QString>;
     dependantPackages->setAutoDelete( true );
 
     ret = executeIpkgCommand( commands, option );
 
+    if ( aborted )
+        return false;
+
     if ( option == "install" || option == "reinstall" )
     {
         // If we are not removing packages and make links option is selected
         // create the links
         createLinks = true;
         if ( flags & MAKE_LINKS )
         {
             emit outputText( " " );
             emit outputText( QString( "Creating symbolic links for " )+ package );
 
             linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir );
 
@@ -247,26 +251,35 @@ void Ipkg :: removeStatusEntry()
     }
     
     in.close();
     out.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()));
 
     connect(proc, SIGNAL(receivedStdout(OProcess *, char *, int)),
             this, SLOT(commandStdout(OProcess *, char *, int)));
 
     connect(proc, SIGNAL(receivedStderr(OProcess *, char *, int)),
             this, SLOT(commandStderr(OProcess *, char *, int)));
     
     for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it )
@@ -308,28 +321,37 @@ void Ipkg::commandStderr(OProcess*, char *buffer, int buflen)
 
     QString lineStr = buffer;
     if ( lineStr[buflen-1] == '\n' )
         buflen --;
     lineStr=lineStr.left( buflen );
     emit outputText( lineStr );
     buffer[0] = '\0';
 }
 
 void Ipkg::processFinished()
 {
     delete proc;
+    proc = 0;
     finished = true;
 }
 
 
+void Ipkg :: abort()
+{
+    if ( proc )
+    {
+        proc->kill();
+        aborted = true;
+    }
+}
 
 /*
 int Ipkg :: executeIpkgCommand( QString &cmd, const QString option )
 {
     FILE *fp = NULL;
     char line[130];
     QString lineStr, lineStrOld;
     int ret = false;
 
     fp = popen( (const char *) cmd, "r");
     if ( fp == NULL )
     {
diff --git a/noncore/settings/aqpkg/ipkg.h b/noncore/settings/aqpkg/ipkg.h
index 25bae59..f08667b 100644
--- a/noncore/settings/aqpkg/ipkg.h
+++ b/noncore/settings/aqpkg/ipkg.h
@@ -50,28 +50,30 @@ public:
     void setDestination( const char *dest )         { destination = dest; }
     void setDestinationDir( const char *dir )       { destDir = dir; }
     void setFlags( int fl )                         { flags = fl; }
     void setRuntimeDirectory( const char *dir )     { runtimeDir = dir; }
 
 signals:
     void outputText( const QString &text );
 
 public slots:
     void commandStdout(OProcess*, char *buffer, int buflen);
     void commandStderr(OProcess*, char *buffer, int buflen);
     void processFinished();
+    void abort();
 
     
 private:
     bool createLinks;
+    bool aborted;
     QString option;
     QString package;
     QString destination;
     QString destDir;
     QString runtimeDir;
     OProcess *proc;
     int flags;
     bool finished;
 
     QList<QString> *dependantPackages;
     
     int executeIpkgCommand( QStringList &cmd, const QString option );