author | andyq <andyq> | 2002-11-23 15:27:33 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-11-23 15:27:33 (UTC) |
commit | 7763c095d81f44cd3012d894da6b17eb0b0cc194 (patch) (side-by-side diff) | |
tree | 286c3392f3ad9b06429a136413590ec99ebefadf /noncore/settings | |
parent | dd850ee9705b0329d49c3e1b0f22d76ce62f7a0b (diff) | |
download | opie-7763c095d81f44cd3012d894da6b17eb0b0cc194.zip opie-7763c095d81f44cd3012d894da6b17eb0b0cc194.tar.gz opie-7763c095d81f44cd3012d894da6b17eb0b0cc194.tar.bz2 |
1.6 Beta - Changed ipg process to use OProcess instead of popen for async io
-rw-r--r-- | noncore/settings/aqpkg/global.h | 2 | ||||
-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 115 | ||||
-rw-r--r-- | noncore/settings/aqpkg/ipkg.h | 16 |
3 files changed, 106 insertions, 27 deletions
diff --git a/noncore/settings/aqpkg/global.h b/noncore/settings/aqpkg/global.h index e1a4ed4..cec9aa5 100644 --- a/noncore/settings/aqpkg/global.h +++ b/noncore/settings/aqpkg/global.h @@ -19,5 +19,5 @@ #define __GLOBAL_H -#define VERSION_TEXT "AQPkg Version 1.5" +#define VERSION_TEXT "AQPkg Version 1.6 BETA" // Uncomment the below line to run on a Linux box rather than a Zaurus diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp index dad34b0..1efe030 100644 --- a/noncore/settings/aqpkg/ipkg.cpp +++ b/noncore/settings/aqpkg/ipkg.cpp @@ -32,4 +32,6 @@ using namespace std; #include <qtextstream.h> +#include <opie/oprocess.h> + #include "utils.h" #include "ipkg.h" @@ -56,19 +58,19 @@ bool Ipkg :: runIpkg( ) { bool ret = false; + QStringList commands; QDir::setCurrent( "/tmp" ); - QString cmd = ""; if ( runtimeDir != "" ) { - cmd += "cd "; - cmd += runtimeDir; - cmd += " ; "; + commands << "cd "; + commands << runtimeDir; + commands << ";"; } - cmd += "ipkg -force-defaults"; + commands << "ipkg" << "-force-defaults"; // only set the destination for an install operation if ( option == "install" ) - cmd += " -dest "+ destination; + commands << "-dest" << destination; @@ -76,13 +78,13 @@ bool Ipkg :: runIpkg( ) { if ( flags & FORCE_DEPENDS ) - cmd += " -force-depends"; + commands << "-force-depends"; if ( flags & FORCE_REINSTALL ) - cmd += " -force-reinstall"; + commands << "-force-reinstall"; if ( flags & FORCE_REMOVE ) - cmd += " -force-removal-of-essential-packages"; + commands << "-force-removal-of-essential-packages"; if ( flags & FORCE_OVERWRITE ) - cmd += " -force-overwrite"; + commands << "-force-overwrite"; if ( flags & VERBOSE_WGET ) - cmd += " -verbose_wget"; + commands << "-verbose_wget"; // Handle make links @@ -99,16 +101,15 @@ bool Ipkg :: runIpkg( ) #ifdef X86 - cmd += " -f "; - cmd += IPKG_CONF; + commands << "-f"; + commands << IPKG_CONF; #endif if ( option == "reinstall" ) - cmd += " install"; + commands << "install"; else - cmd += " " + option; + commands << option; if ( package != "" ) - cmd += " " + package; - cmd += " 2>&1"; + commands << package; @@ -131,11 +132,9 @@ bool Ipkg :: runIpkg( ) } - emit outputText( cmd ); - // Execute command dependantPackages = new QList<QString>; dependantPackages->setAutoDelete( true ); - ret = executeIpkgCommand( cmd, option ); + ret = executeIpkgCommand( commands, option ); if ( option == "install" || option == "reinstall" ) @@ -172,8 +171,8 @@ bool Ipkg :: runIpkg( ) -// emit outputText( QString( "Finished - status=" ) + (ret ? "success" : "failure") ); emit outputText( "Finished" ); emit outputText( "" ); return ret; + } @@ -256,5 +255,73 @@ void Ipkg :: removeStatusEntry() } +int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString option ) +{ + // OK we're gonna use OProcess to run this thing + proc = new OProcess(); + + // 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 ) + { + qDebug( "%s ", (*it).latin1() ); + *proc << (*it).latin1(); + } + cout << endl; + + // Start the process going + finished = false; + if(!proc->start(OProcess::NotifyOnExit, OProcess::All)) + { + emit outputText( QString( "Couldn't start ipkg process" ) ); + qDebug( "Couldn't start ipkg process!" ); + } + + // Now wait for it to finish + while ( !finished ) + qApp->processEvents(); +} + +void Ipkg::commandStdout(OProcess*, char *buffer, int buflen) +{ + qDebug("received stdout %d bytes", buflen); + + QString lineStr = buffer; + if ( lineStr[buflen-1] == '\n' ) + buflen --; + lineStr = lineStr.left( buflen ); + emit outputText( lineStr ); + qDebug(lineStr); + buffer[0] = '\0'; +} + +void Ipkg::commandStderr(OProcess*, char *buffer, int buflen) +{ + qDebug("received stderrt %d bytes", 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; + finished = true; +} + + + +/* int Ipkg :: executeIpkgCommand( QString &cmd, const QString option ) { @@ -321,5 +388,5 @@ int Ipkg :: executeIpkgCommand( QString &cmd, const QString option ) return ret; } - +*/ void Ipkg :: linkPackage( const QString &packFileName, const QString &dest, const QString &destDir ) @@ -349,8 +416,8 @@ QStringList* Ipkg :: getList( const QString &packageFilename, const QString &des packageFileDir = "/usr/lib/ipkg/info/"+packageFilename+".list"; f.setName( packageFileDir ); -// cout << "Try to open " << packageFileDir.latin1() << endl; + qDebug( "Try to open %s", packageFileDir.latin1() ); if ( ! f.open(IO_ReadOnly) ) { - cout << "Could not open:" << packageFileDir << endl; + qDebug( "Could not open: %s", packageFileDir ); emit outputText( QString( "Could not open :" ) + packageFileDir ); return (QStringList*)0; diff --git a/noncore/settings/aqpkg/ipkg.h b/noncore/settings/aqpkg/ipkg.h index 7099ca7..25bae59 100644 --- a/noncore/settings/aqpkg/ipkg.h +++ b/noncore/settings/aqpkg/ipkg.h @@ -26,4 +26,5 @@ #include <qobject.h> #include <qstring.h> +#include <qstringlist.h> #include <qlist.h> @@ -35,4 +36,6 @@ #define VERBOSE_WGET 0x0020 +class OProcess; + class Ipkg : public QObject { @@ -53,4 +56,10 @@ signals: void outputText( const QString &text ); +public slots: + void commandStdout(OProcess*, char *buffer, int buflen); + void commandStderr(OProcess*, char *buffer, int buflen); + void processFinished(); + + private: bool createLinks; @@ -59,10 +68,12 @@ private: QString destination; QString destDir; - int flags; QString runtimeDir; + OProcess *proc; + int flags; + bool finished; QList<QString> *dependantPackages; - int executeIpkgCommand( QString &cmd, const QString option ); + int executeIpkgCommand( QStringList &cmd, const QString option ); void removeStatusEntry(); void linkPackage( const QString &packFileName, const QString &dest, const QString &destDir ); @@ -70,4 +81,5 @@ private: void processFileList( const QStringList *fileList, const QString &destDir ); void processLinkDir( const QString &file, const QString &baseDir, const QString &destDir ); + }; |