summaryrefslogtreecommitdiff
authorerik <erik>2007-01-23 21:39:59 (UTC)
committer erik <erik>2007-01-23 21:39:59 (UTC)
commit8644340455a433f4d6e3b31b329479f1e7983f78 (patch) (side-by-side diff)
tree8429c11d6634f4d8a7ad83fd59aaf03989d027a3
parentadcf6075db477909dd8170a74862a6ef91a5127f (diff)
downloadopie-8644340455a433f4d6e3b31b329479f1e7983f78.zip
opie-8644340455a433f4d6e3b31b329479f1e7983f78.tar.gz
opie-8644340455a433f4d6e3b31b329479f1e7983f78.tar.bz2
A couple more return values that need to be checked.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/opie-login/passworddialogimpl.cpp6
-rw-r--r--noncore/settings/aqpkg/ipkg.cpp11
2 files changed, 14 insertions, 3 deletions
diff --git a/core/opie-login/passworddialogimpl.cpp b/core/opie-login/passworddialogimpl.cpp
index d9132e2..3c1b474 100644
--- a/core/opie-login/passworddialogimpl.cpp
+++ b/core/opie-login/passworddialogimpl.cpp
@@ -163,9 +163,13 @@ void PasswordDialogImpl::writePassword() {
}
::fclose( file );
::endpwent();
- ::rename("/etc/passwd.new","/etc/passwd" );
+ if (::rename("/etc/passwd.new","/etc/passwd" ) == -1)
+ return error( tr("Rename /etc/passwd failed"),
+ tr("<qt>Renaming /etc/passwd.new to /etc/passwd failed."
+ "Please check your /etc/passed file, your /etc directory "
+ "or your filesystem.</qt>") );
/* should be done now */
#ifdef OPIE_LOGIN_SHADOW_PW
#error "Can't write Shadow Passwords fixme"
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index dd9e78d..c5c6387 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -208,9 +208,9 @@ void Ipkg :: removeStatusEntry()
}
if ( !writeFile.open( IO_WriteOnly ) )
{
- tempstr = tr("Couldn't create tempory status file - ");
+ tempstr = tr("Couldn't create temporary status file - ");
tempstr.append( outStatusFile );
emit outputText( tempstr );
return;
}
@@ -269,9 +269,16 @@ void Ipkg :: removeStatusEntry()
writeFile.close();
// Remove old status file and put tmp stats file in its place
remove( statusFile );
- rename( outStatusFile, statusFile );
+ if (::rename( outStatusFile, statusFile ) == -1)
+ {
+ tempstr = tr("Couldn't rename temporary status file - ");
+ tempstr.append( outStatusFile );
+ tempstr.append( tr("to status file - ") );
+ tempstr.append( statusFile );
+ emit outputText( tempstr );
+ }
}
int Ipkg :: executeIpkgLinkCommand( QStringList *cmd )
{