2 files changed, 78 insertions, 9 deletions

diff --git a/library/filemanager.cpp b/library/filemanager.cpp
index 2b97846..cc657fa 100644
--- a/library/filemanager.cpp
+++ b/library/filemanager.cpp
@@ -27,8 +27,13 @@
 #include <qtextcodec.h>
 
 #include <errno.h>
 #include <stdlib.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <sys/sendfile.h>
+#include <fcntl.h>
 
 /*!
   \class FileManager
   \brief The FileManager class assists with AppLnk input/output.
@@ -58,22 +63,24 @@ bool FileManager::saveFile( const DocLnk &f, const QByteArray &data )
 {
     QString fn = f.file() + ".new";
     ensurePathExists( fn );
     QFile fl( fn );
-    if ( !fl.open( IO_WriteOnly|IO_Raw ) )
+    if ( !fl.open( IO_WriteOnly|IO_Raw ) ) {
+       qWarning("open failed");
         return FALSE;
+    }
     int total_written = fl.writeBlock( data );
     fl.close();
     if ( total_written != int(data.size()) || !f.writeLink() ) {
         QFile::remove( fn );
         return FALSE;
     }
+       qDebug("total written %d out of %d", total_written, data.size());
     // else rename the file...
-    if ( ::rename( fn.latin1(), f.file().latin1() ) < 0 ) {
+    if ( !renameFile( fn.latin1(), f.file().latin1() ) ) {
         qWarning( "problem renaming file %s to %s, errno: %d", fn.latin1(),
                   f.file().latin1(), errno );
         // remove the file...
-        QFile::remove( fn );
     }
     return TRUE;
 }
 
@@ -89,9 +96,9 @@ bool FileManager::saveFile( const DocLnk &f, const QString &text )
     QString fn = f.file() + ".new";
     ensurePathExists( fn );
     QFile fl( fn );
     if ( !fl.open( IO_WriteOnly|IO_Raw ) ) {
-        qDebug( "open failed: %s", fn.latin1() );
+       qWarning("open failed");
         return FALSE;
     }
 
     QCString cstr = text.utf8();
@@ -101,14 +108,13 @@ bool FileManager::saveFile( const DocLnk &f, const QString &text )
     if ( total_written != int(cstr.length()) || !f.writeLink() ) {
         QFile::remove( fn );
         return FALSE;
     }
-    // okay now rename the file...
-    if ( ::rename( fn.latin1(), f.file().latin1() ) < 0 ) {
+    // okay now rename the file..
+    if ( !renameFile( fn.latin1(), f.file().latin1() ) ) {
         qWarning( "problem renaming file %s to %s, errno: %d", fn.latin1(),
                   f.file().latin1(), errno );
-        // remove the tmp file, otherwise, it will just lay around...
-        QFile::remove( fn.latin1() );
+
     }
     return TRUE;
 }
 
@@ -196,9 +202,9 @@ bool FileManager::copyFile( const AppLnk &src, const AppLnk &dest )
         ok = dest.writeLink();
     
     if ( ok ) {
         // okay now rename the file...
-        if ( ::rename( fn.latin1(), dest.file().latin1() ) < 0 ) {
+  if ( !renameFile( fn.latin1(), dest.file().latin1() )  ) {
             qWarning( "problem renaming file %s to %s, errno: %d", fn.latin1(),
                       dest.file().latin1(), errno );
             // remove the tmp file, otherwise, it will just lay around...
             QFile::remove( fn.latin1() );
@@ -209,8 +215,69 @@ bool FileManager::copyFile( const AppLnk &src, const AppLnk &dest )
 
     return ok;
 }
 
+bool FileManager::copyFile( const QString & src, const QString & dest ) {
+   bool success = true;
+   struct stat status;
+   int read_fd=0;
+   int write_fd=0;
+   struct stat stat_buf;
+   off_t offset = 0;
+   QFile srcFile(src);
+   QFile destFile(dest);
+
+   if(!srcFile.open( IO_ReadOnly|IO_Raw)) {
+         return success = false;
+   }
+   read_fd = srcFile.handle();
+   if(read_fd != -1) {
+      fstat (read_fd, &stat_buf);
+      if( !destFile.open( IO_WriteOnly|IO_Raw ) )
+            return success = false;
+      write_fd = destFile.handle(); 
+      if(write_fd != -1) {
+         int err=0;
+         QString msg;
+         err = sendfile(write_fd, read_fd, &offset, stat_buf.st_size);
+         if( err == -1) {
+            switch(err) {
+            case EBADF : msg = "The input file was not opened for reading or the output file was not opened for writing. ";
+            case EINVAL: msg = "Descriptor is not valid or locked. ";
+            case ENOMEM: msg = "Insufficient memory to read from in_fd.";
+            case EIO: msg = "Unspecified error while reading from in_fd.";
+            };
+            success = false;
+         }
+      } else {
+         qWarning("open write failed %s, %s",src.latin1(), dest.latin1());
+         success = false;
+      }
+   } else {
+      qWarning("open read failed %s, %s",src.latin1(), dest.latin1());
+      success = false;
+   }
+   srcFile.close();
+   destFile.close();
+    // Set file permissions
+  if( stat( (const char *) src, &status ) == 0 ) {
+      chmod( (const char *) dest, status.st_mode );
+    }
+
+  return success;
+}
+
+
+bool FileManager::renameFile( const QString & src, const QString & dest ) {
+   if(copyFile( src, dest )) {
+      if(QFile::remove(src) ) {
+       return true;
+      }
+   }
+    return false;  
+}
+
+
 /*!
   Opens the document specified by \a f as a readable QIODevice.
   The caller must delete the return value.
 
diff --git a/library/filemanager.h b/library/filemanager.h
index f8d9425..61a3341 100644
--- a/library/filemanager.h
+++ b/library/filemanager.h
@@ -37,8 +37,10 @@ public:
     bool saveFile( const DocLnk&, const QString &text );
     bool loadFile( const DocLnk&, QByteArray &data );
     bool loadFile( const DocLnk&, QString &text );
     bool copyFile( const AppLnk &src, const AppLnk &dest );
+    bool copyFile( const QString & src, const QString & dest );
+    bool renameFile( const QString &, const QString &);
 
     // The caller must delete the return values.
     QIODevice* openFile( const DocLnk& );
     QIODevice* saveFile( const DocLnk& );