2 files changed, 22 insertions, 17 deletions

diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 4bbc62b..1c81a55 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -765,99 +765,96 @@ void TextEdit::openFile( const DocLnk &f ) {
     doc->setName(currentFileName);
     updateCaption();
     setTimer();
 }
 
 void TextEdit::showEditTools() {
     menu->show();
     editBar->show();
     if(!useSearchBar)
         searchBar->hide();
     else
         searchBar->show();
     setWState (WState_Reserved1 );
 }
 
 /*!
   unprompted save */
 bool TextEdit::save() {
 		QString name, file;
     odebug << "saveAsFile " + currentFileName << oendl;
     if(currentFileName.isEmpty()) {
         saveAs();
         return false;
     }
-		name = currentFileName;
 		if(doc) {
 				file = doc->file();
 				odebug << "saver file "+file << oendl;
 				name = doc->name();
 				odebug << "File named "+name << oendl;
 		} else {
 				file = currentFileName;
         name = QFileInfo(currentFileName).baseName();
 		 }
 
     QString rt = editor->text();
     if( !rt.isEmpty() ) {
         if(name.isEmpty()) {
             saveAs();
         } else {
             currentFileName = name;
             odebug << "saveFile "+currentFileName << oendl;
 
             struct stat buf;
             mode_t mode;
-            stat(file.latin1(), &buf);
+            QFile f(file);
+            fstat(f.handle(), &buf);
             mode = buf.st_mode;
 
             if(!fileIs) {
                 doc->setName( name);
                 FileManager fm;
                 if ( !fm.saveFile( *doc, rt ) ) {
 										QMessageBox::message(tr("Text Edit"),tr("Save Failed"));
                     return false;
                 }
             } else {
                 odebug << "regular save file" << oendl;
-                QFile f(file);
 								if( f.open(IO_WriteOnly)) {
 										QCString crt = rt.utf8();
 										f.writeBlock(crt,crt.length());
 								} else {
 										QMessageBox::message(tr("Text Edit"),tr("Write Failed"));
 										return false;
 								}
-
             }
             editor->setEdited( false);
             edited1=false;
             edited=false;
             if(caption().left(1)=="*")
 								setCaption(caption().right(caption().length()-1));
 
-
-            chmod( file.latin1(), mode);
+            fchmod( f.handle(), mode);
         }
         return true;
     }
     return false;
 }
 
 /*!
   prompted save */
 bool TextEdit::saveAs() {
 
     if(caption() == tr("Text Editor"))
         return false;
     odebug << "saveAsFile " + currentFileName << oendl;
 
     QString rt = editor->text();
     odebug << currentFileName << oendl;
 
     if( currentFileName.isEmpty()
         || currentFileName == tr("Unnamed")
         || currentFileName == tr("Text Editor"))
     {
         odebug << "do silly TT filename thing" << oendl;
         QString pt = rt.simplifyWhiteSpace();
         int i = pt.find( ' ' );
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
@@ -199,68 +199,76 @@ void PackageHandler::addPackages( const QString &location )
     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 {
+            // @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;
+                odebug << "remove symlink for " << s << oendl;
+                QFile symFile(s);
+                QFileInfo symFileInfo(symFile);
         //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() );
+                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();
 
         //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.