1 files changed, 63 insertions, 3 deletions

diff --git a/library/filemanager.cpp b/library/filemanager.cpp
index 91986a0..1c1c998 100644
--- a/library/filemanager.cpp
+++ b/library/filemanager.cpp
@@ -185,69 +185,67 @@ bool FileManager::copyFile( const AppLnk &src, const AppLnk &dest )
   return FALSE;
 
     QString fn = dest.file() + ".new";
     ensurePathExists( fn );
     QFile df( fn );
     if ( !df.open( IO_WriteOnly|IO_Raw ) )
   return FALSE;
 
     const int bufsize = 16384;
     char buffer[bufsize];
     bool ok = TRUE;
     int bytesRead = 0;
     while ( ok && !sf.atEnd() ) {
   bytesRead = sf.readBlock( buffer, bufsize );
   if ( bytesRead < 0 )
       ok = FALSE;
   while ( ok && bytesRead > 0 ) {
       int bytesWritten = df.writeBlock( buffer, bytesRead );
       if ( bytesWritten < 0 )
     ok = FALSE;
       else
     bytesRead -= bytesWritten;
   }
     }
-    
+
     if ( ok )
   ok = dest.writeLink();
     
     if ( ok ) {
   // okay now rename the file...
   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() );
   }
     } else {
   QFile::remove( fn.latin1() );
     }
 
     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;
 #ifdef Q_OS_MACX
 #ifdef SENDMAIL
@@ -299,48 +297,110 @@ bool FileManager::copyFile( const QString & src, const QString & dest ) {
       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;  
 }
 
 
+=======
+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.
 
   Returns 0 if the operation fails.
 */
 QIODevice* FileManager::openFile( const DocLnk& f )
 {
     QString fn = f.file();
     QFile* fl = new QFile( fn );
     if ( !fl->open( IO_ReadOnly ) ) {
   delete fl;
         fl = 0;
     }
     return fl;
 }
 
 /*!
   Opens the document specified by \a f as a writable QIODevice.
   The caller must delete the return value.
 
   Returns 0 if the operation fails.
 */
 QIODevice* FileManager::saveFile( const DocLnk& f )