summaryrefslogtreecommitdiff
path: root/library/filemanager.cpp
authorar <ar>2004-06-18 19:58:14 (UTC)
committer ar <ar>2004-06-18 19:58:14 (UTC)
commitd45caef648bce4a73f6f847bc6e9aad125977deb (patch) (side-by-side diff)
tree2e57aec5300028df4b90b1d07aeabd84e4ebc72f /library/filemanager.cpp
parent589dc38a4c44ed7cdd151cf6c136b199ec273398 (diff)
downloadopie-d45caef648bce4a73f6f847bc6e9aad125977deb.zip
opie-d45caef648bce4a73f6f847bc6e9aad125977deb.tar.gz
opie-d45caef648bce4a73f6f847bc6e9aad125977deb.tar.bz2
- use QFile::encodeName instead of (const char*) or latin1()
- use POSIX rename
Diffstat (limited to 'library/filemanager.cpp') (more/less context) (show whitespace changes)
-rw-r--r--library/filemanager.cpp19
1 files changed, 9 insertions, 10 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.
@@ -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;
}