| -rw-r--r-- | library/filemanager.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/library/filemanager.cpp b/library/filemanager.cpp index 47af1c6..2e5efdd 100644 --- a/library/filemanager.cpp +++ b/library/filemanager.cpp @@ -15,32 +15,33 @@ ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "filemanager.h" #include "applnk.h" /* QT */ #include <qdir.h> #include <qfileinfo.h> #include <qtextstream.h> /* STD */ #include <stdlib.h> +#include <errno.h> #include <sys/stat.h> /*! \class FileManager \brief The FileManager class assists with AppLnk input/output. */ /*! Constructs a FileManager. */ FileManager::FileManager() { } /*! Destroys a FileManager. @@ -50,76 +51,76 @@ FileManager::~FileManager() } /*! Saves \a data as the document specified by \a f. Returns whether the operation succeeded. */ bool FileManager::saveFile( const DocLnk &f, const QByteArray &data ) { QString fileName = f.file() + ".new"; ensurePathExists( fileName ); QFile file( fileName ); //write data in temporary .new file if ( !file.open( IO_WriteOnly|IO_Raw ) ) { - qWarning("open failed"); + qWarning( "open failed" ); return FALSE; } int total_written = file.writeBlock( data ); file.close(); //check if every was written - if ( total_written != int(data.size()) || !f.writeLink() ) + if ( total_written != int( data.size() ) || !f.writeLink() ) { QFile::remove( fileName ); return FALSE; } - qDebug("total written %d out of %d", total_written, data.size()); + qDebug( "total written %d out of %d", total_written, data.size() ); //rename temporary .new file in original filenam if ( !renameFile( fileName, f.file() ) ) QFile::remove( fileName); return TRUE; } /*! Saves \a text as the document specified by \a f. The text is saved in UTF8 format. Returns whether the operation succeeded. */ bool FileManager::saveFile( const DocLnk &f, const QString &text ) { QString fileName = f.file() + ".new"; ensurePathExists( fileName ); QFile file( fileName ); //write data in temporary .new file if ( !file.open( IO_WriteOnly|IO_Raw ) ) { - qWarning("open failed"); + qWarning( "open failed" ); return FALSE; } QCString cstr = text.utf8(); int total_written; total_written = file.writeBlock( cstr.data(), cstr.length() ); file.close(); - if ( total_written != int(cstr.length()) || !f.writeLink() ) + if ( total_written != int( cstr.length()) || !f.writeLink() ) { QFile::remove( fileName ); return FALSE; } // okay now rename the file.. if ( !renameFile( fileName, f.file() ) ) QFile::remove( fileName); return TRUE; } /*! Loads \a text from the document specified by \a f. The text is required to be in UTF8 format. @@ -175,39 +176,39 @@ bool FileManager::copyFile( const AppLnk &src, const AppLnk &dest ) if ( !srcFile.open( IO_ReadOnly ) ) return FALSE; QString fileName = dest.file() + ".new"; ensurePathExists( fileName ); bool ok = TRUE; ok = copyFile( src.file(), fileName ); if ( ok ) ok = dest.writeLink(); if ( ok ) { // okay now rename the file... - if ( !renameFile( fileName.latin1(), dest.file().latin1() ) ) + if ( !renameFile( fileName, dest.file() ) ) // remove the tmp file, otherwise, it will just lay around... - QFile::remove( fileName.latin1() ); + QFile::remove( fileName ); } else { - QFile::remove( fileName.latin1() ); + QFile::remove( fileName ); } return ok; } bool FileManager::copyFile( const QString & src, const QString & dest ) { //open read file QFile srcFile( src ); if( !srcFile.open( IO_ReadOnly|IO_Raw) ) { qWarning( "open read failed %s, %s", src.latin1(), dest.latin1() ); return FALSE; } //open write file QFile destFile( dest ); @@ -228,46 +229,45 @@ bool FileManager::copyFile( const QString & src, const QString & dest ) bytesRead = srcFile.readBlock( buffer, bufsize ); if ( bytesRead < 0 ) ok = FALSE; while ( ok && bytesRead > 0 ) { int bytesWritten = destFile.writeBlock( buffer, bytesRead ); if ( bytesWritten < 0 ) ok = FALSE; else bytesRead -= bytesWritten; } } srcFile.close(); destFile.close(); // Set file permissions struct stat status; - if( stat( (const char *) src, &status ) == 0 ) + if( stat( QFile::encodeName( src ), &status ) == 0 ) { - chmod( (const char *) dest, status.st_mode ); + chmod( QFile::encodeName( dest ), status.st_mode ); } return ok; } bool FileManager::renameFile( const QString & src, const QString & dest ) { - QDir dir( QFileInfo( src ).absFilePath() ); - if ( !dir.rename( src, dest ) ) + if( rename( QFile::encodeName( src ), QFile::encodeName( dest ) ) == -1); { - qWarning( "problem renaming file %s to %s", src, dest ); + qWarning( "problem renaming file %s to %s, errno: %d", src.latin1(), dest.latin1(), errno ); return false; } return true; } /*! 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 ) ) @@ -307,22 +307,21 @@ QIODevice* FileManager::saveFile( const DocLnk& f ) */ bool FileManager::exists( const DocLnk &f ) { return QFile::exists(f.file()); } /*! Ensures that the path \a fn exists, by creating required directories. Returns TRUE if successful. */ bool FileManager::ensurePathExists( const QString &fn ) { QFileInfo fi(fn); fi.setFile( fi.dirPath(TRUE) ); if ( !fi.exists() ) { - if ( system(("mkdir -p "+fi.filePath())) ) + if ( system( ("mkdir -p " + QFile::encodeName( fi.filePath() ) ) ) ) return FALSE; } - return TRUE; } |