summaryrefslogtreecommitdiff
authorandyq <andyq>2002-11-23 15:27:33 (UTC)
committer andyq <andyq>2002-11-23 15:27:33 (UTC)
commit7763c095d81f44cd3012d894da6b17eb0b0cc194 (patch) (side-by-side diff)
tree286c3392f3ad9b06429a136413590ec99ebefadf
parentdd850ee9705b0329d49c3e1b0f22d76ce62f7a0b (diff)
downloadopie-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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/global.h2
-rw-r--r--noncore/settings/aqpkg/ipkg.cpp121
-rw-r--r--noncore/settings/aqpkg/ipkg.h18
3 files changed, 110 insertions, 31 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
@@ -15,13 +15,13 @@
* *
***************************************************************************/
#ifndef __GLOBAL_H
#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
// box this allows you to change where root is, and where to load config files from
// #define X86
// Sets up location of ipkg.conf and root directory
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
@@ -28,12 +28,14 @@ using namespace std;
#else
#include <qapplication.h>
#endif
#include <qdir.h>
#include <qtextstream.h>
+#include <opie/oprocess.h>
+
#include "utils.h"
#include "ipkg.h"
#include "global.h"
Ipkg :: Ipkg()
{
@@ -52,41 +54,41 @@ Ipkg :: ~Ipkg()
// destDir is the dir that the destination alias points to (used to link to root)
// flags is the ipkg options flags
// dir is the directory to run ipkg in (defaults to "")
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;
if ( option != "update" && option != "download" )
{
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
// Rules - If make links is switched on, create links to root
// if destDir is NOT /
if ( flags & MAKE_LINKS )
{
@@ -95,24 +97,23 @@ bool Ipkg :: runIpkg( )
if ( destDir == "/" )
flags ^= MAKE_LINKS;
}
}
#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;
if ( package != "" )
emit outputText( QString( "Dealing with package " ) + package );
qApp->processEvents();
@@ -127,30 +128,28 @@ bool Ipkg :: runIpkg( )
emit outputText( QString( "Removing symbolic links...\n" ) );
linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir );
emit outputText( QString( " " ) );
}
}
- 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" )
{
// 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 );
// link dependant packages that were installed with this release
QString *pkg;
for ( pkg = dependantPackages->first(); pkg != 0; pkg = dependantPackages->next() )
{
@@ -166,18 +165,18 @@ bool Ipkg :: runIpkg( )
delete dependantPackages;
// Finally, if we are removing a package, remove its entry from the <destdir>/usr/lib/ipkg/status file
// to workaround an ipkg bug which stops reinstall to a different location
if ( option == "remove" )
removeStatusEntry();
-
-// emit outputText( QString( "Finished - status=" ) + (ret ? "success" : "failure") );
+
emit outputText( "Finished" );
emit outputText( "" );
return ret;
+
}
void Ipkg :: removeStatusEntry()
{
QString statusFile = destDir;
if ( statusFile.right( 1 ) != "/" )
@@ -252,13 +251,81 @@ void Ipkg :: removeStatusEntry()
// 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 )
+{
+ // 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 )
{
FILE *fp = NULL;
char line[130];
QString lineStr, lineStrOld;
int ret = false;
@@ -290,13 +357,13 @@ int Ipkg :: executeIpkgCommand( QString &cmd, const QString option )
int start = lineStr.find( " " ) + 1;
int end = lineStr.find( " ", start );
QString *package = new QString( lineStr.mid( start, end-start ) );
dependantPackages->append( package );
}
}
-
+
if ( option == "update" )
{
if (lineStr.contains("Updated list"))
ret = true;
}
else if ( option == "download" )
@@ -317,13 +384,13 @@ int Ipkg :: executeIpkgCommand( QString &cmd, const QString option )
}
pclose(fp);
}
return ret;
}
-
+*/
void Ipkg :: linkPackage( const QString &packFileName, const QString &dest, const QString &destDir )
{
if ( dest == "root" || dest == "/" )
return;
@@ -345,16 +412,16 @@ QStringList* Ipkg :: getList( const QString &packageFilename, const QString &des
// Couldn't open from dest, try from /
cout << "Could not open:" << packageFileDir << endl;
f.close();
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;
}
}
QStringList *fileList = new QStringList();
QTextStream t( &f );
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
@@ -22,21 +22,24 @@
/**
*@author Andy Qua
*/
#include <qobject.h>
#include <qstring.h>
+#include <qstringlist.h>
#include <qlist.h>
#define FORCE_DEPENDS 0x0001
#define FORCE_REMOVE 0x0002
#define FORCE_REINSTALL 0x0004
#define FORCE_OVERWRITE 0x0008
#define MAKE_LINKS 0x0010
#define VERBOSE_WGET 0x0020
-
+
+class OProcess;
+
class Ipkg : public QObject
{
Q_OBJECT
public:
Ipkg();
~Ipkg();
@@ -48,27 +51,36 @@ public:
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();
+
private:
bool createLinks;
QString option;
QString package;
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 );
QStringList* getList( const QString &packageFilename, const QString &destDir );
void processFileList( const QStringList *fileList, const QString &destDir );
void processLinkDir( const QString &file, const QString &baseDir, const QString &destDir );
+
};
#endif