summaryrefslogtreecommitdiff
authordrw <drw>2003-04-23 01:04:02 (UTC)
committer drw <drw>2003-04-23 01:04:02 (UTC)
commit43b2c74f7d32ce9c744e4d79e62a92e0181604c3 (patch) (side-by-side diff)
tree894049bfdc5724ea167f3dbc437cf0d18b93f3c1
parent509ac60dfd2e0829f56fb65407ddbe57f7668d70 (diff)
downloadopie-43b2c74f7d32ce9c744e4d79e62a92e0181604c3.zip
opie-43b2c74f7d32ce9c744e4d79e62a92e0181604c3.tar.gz
opie-43b2c74f7d32ce9c744e4d79e62a92e0181604c3.tar.bz2
Fix for bug #864 and some other code tweaks to reduce executable size
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/aqpkg/ipkg.cpp80
1 files changed, 46 insertions, 34 deletions
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index 7df643e..e906653 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -173,5 +173,4 @@ bool Ipkg :: runIpkg( )
emit outputText( "" );
return ret;
-
}
@@ -180,12 +179,17 @@ void Ipkg :: removeStatusEntry()
QString statusFile = destDir;
if ( statusFile.right( 1 ) != "/" )
- statusFile += "/";
- statusFile += "usr/lib/ipkg/status";
- QString outStatusFile = statusFile + ".tmp";
+ statusFile.append( "/" );
+ statusFile.append( "usr/lib/ipkg/status" );
+ QString outStatusFile = statusFile;
+ outStatusFile.append( ".tmp" );
emit outputText( "" );
emit outputText( "Removing status entry..." );
- emit outputText( QString( "status file - " )+ statusFile );
- emit outputText( QString( "package - " )+ package );
+ QString tempstr = "status file - ";
+ tempstr.append( statusFile );
+ emit outputText( tempstr );
+ tempstr = "package - ";
+ tempstr.append( package );
+ emit outputText( tempstr );
ifstream in( statusFile );
@@ -193,5 +197,7 @@ void Ipkg :: removeStatusEntry()
if ( !in.is_open() )
{
- emit outputText( QString( "Couldn't open status file - " )+ statusFile );
+ tempstr = "Couldn't open status file - ";
+ tempstr.append( statusFile );
+ emit outputText( tempstr );
return;
}
@@ -199,5 +205,7 @@ void Ipkg :: removeStatusEntry()
if ( !out.is_open() )
{
- emit outputText( QString( "Couldn't create tempory status file - " )+ outStatusFile );
+ tempstr = "Couldn't create tempory status file - ";
+ tempstr.append( outStatusFile );
+ emit outputText( tempstr );
return;
}
@@ -235,5 +243,5 @@ void Ipkg :: removeStatusEntry()
lines.push_back( QString( line ) );
-// out << line << endl;
+ out << line << endl;
} while ( !in.eof() );
@@ -242,5 +250,4 @@ void Ipkg :: removeStatusEntry()
for ( it = lines.begin() ; it != lines.end() ; ++it )
{
- cout << "Writing " << (const char *)(*it) << endl;
out << (const char *)(*it) << endl;
}
@@ -280,8 +287,6 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it )
{
- qDebug( "%s ", (*it).latin1() );
*proc << (*it).latin1();
}
- cout << endl;
// Start the process going
@@ -290,5 +295,4 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
{
emit outputText( QString( "Couldn't start ipkg process" ) );
- qDebug( "Couldn't start ipkg process!" );
}
@@ -300,6 +304,4 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
void Ipkg::commandStdout(OProcess*, char *buffer, int buflen)
{
- qDebug("received stdout %d bytes", buflen);
-
QString lineStr = buffer;
if ( lineStr[buflen-1] == '\n' )
@@ -321,6 +323,11 @@ void Ipkg::commandStdout(OProcess*, char *buffer, int buflen)
}
}
+ else if ( option == "remove" && !( flags & FORCE_DEPENDS ) &&
+ lineStr.find( "is depended upon by packages:" ) != -1 )
+ {
+ // Ipkg should send this to STDERR, but doesn't - so trap here
+ error = true;
+ }
- qDebug(lineStr);
buffer[0] = '\0';
}
@@ -328,6 +335,4 @@ void Ipkg::commandStdout(OProcess*, char *buffer, int buflen)
void Ipkg::commandStderr(OProcess*, char *buffer, int buflen)
{
- qDebug("received stderrt %d bytes", buflen);
-
QString lineStr = buffer;
if ( lineStr[buflen-1] == '\n' )
@@ -343,4 +348,5 @@ void Ipkg::processFinished()
// 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 ( !error && option == "remove" )
removeStatusEntry();
@@ -372,5 +378,4 @@ int Ipkg :: executeIpkgCommand( QString &cmd, const QString option )
if ( fp == NULL )
{
- cout << "Couldn't execute " << cmd << "! err = " << fp << endl;
QString text;
text.sprintf( "Couldn't execute %s! See stdout for error code", (const char *)cmd );
@@ -442,21 +447,24 @@ void Ipkg :: linkPackage( const QString &packFileName, const QString &dest, cons
QStringList* Ipkg :: getList( const QString &packageFilename, const QString &destDir )
{
- QString packageFileDir = destDir+"/usr/lib/ipkg/info/"+packageFilename+".list";
+ QString packageFileDir = destDir;
+ packageFileDir.append( "/usr/lib/ipkg/info/" );
+ packageFileDir.append( packageFilename );
+ packageFileDir.append( ".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";
+ packageFileDir = "/usr/lib/ipkg/info/";
+ packageFileDir.append( packageFilename );
+ packageFileDir.append( ".list" );
f.setName( packageFileDir );
- qDebug( "Try to open %s", packageFileDir.latin1() );
if ( ! f.open(IO_ReadOnly) )
{
- qDebug( "Could not open: %s", packageFileDir.latin1() );
- emit outputText( QString( "Could not open :" ) + packageFileDir );
+ QString tempstr = "Could not open :";
+ tempstr.append( packageFileDir );
+ emit outputText( tempstr );
return (QStringList*)0;
}
@@ -499,14 +507,15 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const
{
- QString sourceFile = baseDir + file;
+ QString sourceFile = baseDir;
+ sourceFile.append( file );
QString linkFile = destDir;
if ( file.startsWith( "/" ) && destDir.right( 1 ) == "/" )
{
- linkFile += file.mid( 1 );
+ linkFile.append( file.mid( 1 ) );
}
else
{
- linkFile += file;
+ linkFile.append( file );
}
QString text;
@@ -520,5 +529,7 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const
if ( !f.exists() )
{
- emit outputText( QString( "Creating directory " ) + linkFile );
+ QString tempstr = "Creating directory ";
+ tempstr.append( linkFile );
+ emit outputText( tempstr );
QDir d;
d.mkdir( linkFile, true );
@@ -532,5 +543,7 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const
int rc = symlink( sourceFile, linkFile );
text = (rc == 0 ? "Linked " : "Failed to link ");
- text += sourceFile + " to " + linkFile;
+ text.append( sourceFile );
+ text.append( " to " );
+ text.append( linkFile );
emit outputText( text );
}
@@ -547,5 +560,5 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const
text = (rc ? "Removed " : "Failed to remove ");
- text += linkFile;
+ text.append( linkFile );
emit outputText( text );
}
@@ -557,5 +570,5 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const
{
text = (rc ? "Removed " : "Failed to remove ");
- text += linkFile;
+ text.append( linkFile );
emit outputText( text );
}
@@ -563,4 +576,3 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const
}
}
-
}