1 files changed, 0 insertions, 1 deletions

diff --git a/library/filemanager.cpp b/library/filemanager.cpp
index 1c1c998..c51ca2f 100644
--- a/library/filemanager.cpp
+++ b/library/filemanager.cpp
@@ -257,129 +257,128 @@ bool FileManager::copyFile( const QString & src, const QString & dest ) {
           * sysdeputil.c
           */
           /* XXX - start_pos will truncate on 32-bit machines - can we
            * say "start from current pos"?
            */
           off_t written = 0;
           int retval = 0;
           retval = sendfile(read_fd, write_fd, offset, stat_buf.st_size, NULL,
                             &written, 0);
           /* Translate to Linux-like retval */
           if (written > 0)
           {
             err = (int) written;
           }
 #else /* SENDMAIL */
           err == -1;
           msg = "FAILURE: Using unsupported function \"sendfile()\" Need Workaround !!";
           success = false;
 #         warning "Need workaround for sendfile!!(eilers)"
 #endif  /* SENDMAIL */
 
 #else
           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;
           }
 #endif /* Q_OS_MACX */
           if( !success )
                   qWarning( msg );
      } 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;  
 }
 
 
-=======
 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.