1 files changed, 28 insertions, 20 deletions

diff --git a/core/launcher/packageslave.cpp b/core/launcher/packageslave.cpp
index abbc610..965020e 100644
--- a/core/launcher/packageslave.cpp
+++ b/core/launcher/packageslave.cpp
@@ -169,122 +169,130 @@ void PackageHandler::addPackageFiles( const QString &location,
         s = ts.readLine();       // line of text excluding '\n'
         // for s, do link/mkdir.
         if ( s.right(1) == "/" ) {
         odebug << "do mkdir for " << s.ascii() << "" << oendl;
 #ifndef Q_OS_WIN32
         mkdir( s.ascii(), 0777 );
         //possible optimization: symlink directories
         //that don't exist already. -- Risky.
 #else
         d.mkdir( s.ascii());
 #endif
 
         } else {
 #ifndef Q_OS_WIN32
         odebug << "do symlink for " << s.ascii() << "" << oendl;
         symlink( (location + s).ascii(), s.ascii() );
 #else
         odebug << "Copy file instead of a symlink for WIN32" << oendl;
         if (!CopyFile((TCHAR*)qt_winTchar((location + s), TRUE), (TCHAR*)qt_winTchar(s, TRUE), FALSE))
           owarn << "Unable to create symlinkfor " << (location + s).ascii() << oendl;
 #endif
         }
     }
     f.close();
     }
 }
 
 void PackageHandler::addPackages( const QString &location )
 {
     // get list of *.list in location/usr/lib/ipkg/info/*.list
     QDir dir(location + "/usr/lib/ipkg/info", "*.list",  // No tr
          QDir::Name, QDir::Files);
     if ( !dir.exists() )
     return;
 
     QStringList packages = dir.entryList();
     for ( QStringList::Iterator it = packages.begin();
       it != packages.end(); ++it ) {
     addPackageFiles( location, *it );
     }
 }
 
 
 void PackageHandler::cleanupPackageFiles( const QString &listfile  )
 {
     QFile f(listfile);
 
     if ( f.open(IO_ReadOnly) ) {
-    QTextStream ts(&f);
-
-    QString s;
-    while ( !ts.eof() ) {        // until end of file...
-        s = ts.readLine();       // line of text excluding '\n'
-        // for s, do link/mkdir.
-        if ( s.right(1) == "/" ) {
-        //should rmdir if empty, after all files have been removed
-        } else {
+        QTextStream ts(&f);
+
+        QString s;
+        while ( !ts.eof() ) {        // until end of file...
+            s = ts.readLine();       // line of text excluding '\n'
+            // for s, do link/mkdir.
+            // @todo Right now we just move on if the name of the file we
+            // find is actually a directory. What we ought to do is check
+            // to see if the directory is empty and if so remove it.
+            if ( s.right(1) != "/" ) {
 #ifndef Q_OS_WIN32
-        odebug << "remove symlink for " << s.ascii() << "" << oendl;
-        //check if it is a symlink first (don't remove /etc/passwd...)
-        char buf[10]; //we don't care about the contents
-        if ( ::readlink( s.ascii(),buf, 10 >= 0 ) )
-             ::unlink( s.ascii() );
+                odebug << "remove symlink for " << s << oendl;
+                QFile symFile(s);
+                QFileInfo symFileInfo(symFile);
+                //check if it is a symlink first (don't remove /etc/passwd...)
+                if ( !symFileInfo.readLink().isNull())
+                     if (!symFile.remove())
+                         owarn << "Unable to remove symlink " << symFile.name()
+                               << " " << __FILE__ << ":" << __LINE__ << oendl;
 #else
-        // ### revise
-        owarn << "Unable to remove symlink " << __FILE__ << ":" << __LINE__ << "" << oendl;
+                // @todo If we actually want to be portable to other operating
+                // systems we ought to at least have a portable way of removing
+                // their notion of symlinks.
+                owarn << "Unable to remove symlink " << s " " << __FILE__
+                      << ":" << __LINE__ << oendl;
 #endif
+            }
         }
-    }
-    f.close();
+        f.close();
 
         //remove the list file
-    ::unlink( listfile.ascii() );
-
+        if (!f.remove())
+            owarn << "Unable to remove list file " << f.name() << " "
+                  << __FILE__ << ":" << __LINE__ << oendl;
     }
 }
 
 void PackageHandler::cleanupPackages( const QString &location )
 {
     // get list of *.list in location/usr/lib/ipkg/info/*.list
     QDir dir( "/usr/lib/ipkg/info/"+location, "*.list",  // No tr
           QDir::Name, QDir::Files);
     if ( !dir.exists() )
     return;
 
     QStringList packages = dir.entryList();
     for ( QStringList::Iterator it = packages.begin();
       it != packages.end(); ++it ) {
     cleanupPackageFiles( *it );
     }
 
     //remove the backup directory
     //###
 }
 
 void PackageHandler::prepareInstall( const QString& size, const QString& path )
 {
     // Check whether there will be enough space to install the next package.
     bool ok;
     unsigned int s = size.toUInt( &ok );
 
     if ( !ok )
     return;
 
     // Shamelessly stolen from the sysinfo application (Werner)
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
     struct statfs fs;
     if ( statfs( path.latin1(), &fs ) == 0 )
     if ( s > fs.f_bsize * fs.f_bavail ) {
         //odebug << "############### Not enough space left ###############" << oendl;
         mNoSpaceLeft = TRUE;
     }
 #endif
 }
 
 void PackageHandler::iProcessExited()
 {
     if ( currentProcess->normalExit() && currentProcess->exitStatus() == 0 )
     sendReply( "installDone(QString)", currentPackage );
     else {
 #ifndef QT_NO_COP
     QCopEnvelope e( "QPE/Desktop", "installFailed(QString,int,QString)" );