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
@@ -786,7 +786,6 @@ bool TextEdit::save() {
         saveAs();
         return false;
     }
-                name = currentFileName;
                 if(doc) {
                                 file = doc->file();
                                 odebug << "saver file "+file << oendl;
@@ -807,7 +806,8 @@ bool TextEdit::save() {
 
             struct stat buf;
             mode_t mode;
-            stat(file.latin1(), &buf);
+            QFile f(file);
+            fstat(f.handle(), &buf);
             mode = buf.st_mode;
 
             if(!fileIs) {
@@ -819,7 +819,6 @@ bool TextEdit::save() {
                 }
             } else {
                 odebug << "regular save file" << oendl;
-                QFile f(file);
                                                                 if( f.open(IO_WriteOnly)) {
                                                                                 QCString crt = rt.utf8();
                                                                                 f.writeBlock(crt,crt.length());
@@ -827,7 +826,6 @@ bool TextEdit::save() {
                                                                                 QMessageBox::message(tr("Text Edit"),tr("Write Failed"));
                                                                                 return false;
                                                                 }
-
             }
             editor->setEdited( false);
             edited1=false;
@@ -835,8 +833,7 @@ bool TextEdit::save() {
             if(caption().left(1)=="*")
                                                                 setCaption(caption().right(caption().length()-1));
 
-
-            chmod( file.latin1(), mode);
+            fchmod( f.handle(), mode);
         }
         return true;
     }
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
@@ -220,26 +220,34 @@ void PackageHandler::cleanupPackageFiles( const QString &listfile  )
     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;
     }
 }