Diffstat (limited to 'noncore/settings/aqpkg/ipkg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 121 |
1 files changed, 94 insertions, 27 deletions
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 @@ -22,168 +22,167 @@ using namespace std; #include <stdio.h> #include <unistd.h> #ifdef QWS #include <qpe/qpeapplication.h> #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() { } 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) // 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 ) { // If destDir == / turn off make links as package is being insalled // to root already. 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(); // If we are removing packages and make links option is selected // create the links if ( option == "remove" || option == "reinstall" ) { createLinks = false; if ( flags & MAKE_LINKS ) { 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() ) { if ( *pkg == package ) continue; emit outputText( " " ); emit outputText( QString( "Creating symbolic links for " )+ (*pkg) ); linkPackage( Utils::getPackageNameFromIpkFilename( *pkg ), destination, destDir ); } } } 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 ) != "/" ) statusFile += "/"; statusFile += "usr/lib/ipkg/status"; QString outStatusFile = statusFile + ".tmp"; emit outputText( "" ); emit outputText( "Removing status entry..." ); @@ -246,25 +245,93 @@ void Ipkg :: removeStatusEntry() cout << "Writing " << (const char *)(*it) << endl; out << (const char *)(*it) << endl; } 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 ) +{ + // 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; fp = popen( (const char *) cmd, "r"); if ( fp == NULL ) { cout << "Couldn't execute " << cmd << "! err = " << fp << endl; QString text; @@ -284,25 +351,25 @@ int Ipkg :: executeIpkgCommand( QString &cmd, const QString option ) if ( option == "install" || option == "reinstall" ) { // Need to keep track of any dependant packages that get installed // so that we can create links to them as necessary if ( lineStr.startsWith( "Installing " ) ) { 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" ) { if (lineStr.contains("Downloaded")) ret = true; } else { @@ -311,25 +378,25 @@ int Ipkg :: executeIpkgCommand( QString &cmd, const QString option ) } emit outputText( lineStr ); } lineStrOld = lineStr; qApp->processEvents(); } pclose(fp); } return ret; } - +*/ void Ipkg :: linkPackage( const QString &packFileName, const QString &dest, const QString &destDir ) { if ( dest == "root" || dest == "/" ) return; qApp->processEvents(); QStringList *fileList = getList( packFileName, destDir ); qApp->processEvents(); processFileList( fileList, destDir ); delete fileList; } @@ -339,28 +406,28 @@ QStringList* Ipkg :: getList( const QString &packageFilename, const QString &des QString packageFileDir = destDir+"/usr/lib/ipkg/info/"+packageFilename+".list"; QFile f( packageFileDir ); cout << "Try to open " << packageFileDir << endl; if ( !f.open(IO_ReadOnly) ) { // 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 ); while ( !t.eof() ) *fileList += t.readLine(); f.close(); return fileList; } |