Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 252717: assert only when count > 0. debug only.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@159718 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dwitte%stanford.edu
2004-07-23 07:47:10 +00:00
parent acf5efe186
commit 446b9729f5
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/netwerk/base/src/nsFileStreams.cpp
View File

@@ -507,9 +507,22 @@ nsSafeFileOutputStream::Init(nsIFile* file, PRInt32 ioFlags, PRInt32 perm,
mTargetFileExists = PR_TRUE; // Safer to assume it exists - we just do more work.
}
// XXXdwitte I think we want to be following symlinks here... see e.g. bug 206567.
nsCOMPtr<nsIFile> tempResult;
rv = file->Clone(getter_AddRefs(tempResult));
// follow symlinks, for two reasons:
// 1) if a user has deliberately set up a profile file as a symlink, we honor it
// 2) to make the MoveToNative() in Finish() an atomic operation (which may not
// be the case if moving across directories on different filesystems).
nsCOMPtr<nsIFile> tempResult = do_CreateInstance("@mozilla.org/file/local;1", &rv);
if (NS_SUCCEEDED(rv)) {
nsCOMPtr<nsILocalFile> tempLocal = do_QueryInterface(tempResult);
tempLocal->SetFollowLinks(PR_TRUE);
nsCOMPtr<nsILocalFile> fileLocal = do_QueryInterface(file, &rv);
if (NS_SUCCEEDED(rv))
rv = tempLocal->InitWithFile(fileLocal);
}
// XP_UNIX ignores SetFollowLinks(), so we have to normalize.
if (NS_SUCCEEDED(rv))
rv = tempResult->Normalize();
if (NS_SUCCEEDED(rv) && mTargetFileExists) {
PRUint32 origPerm;
if (NS_FAILED(file->GetPermissions(&origPerm))) {
@@ -596,7 +609,7 @@ nsSafeFileOutputStream::Write(const char *buf, PRUint32 count, PRUint32 *result)
else if (count != *result)
mWriteResult = NS_ERROR_LOSS_OF_SIGNIFICANT_DATA;
if (NS_FAILED(mWriteResult))
if (NS_FAILED(mWriteResult) && count > 0)
NS_WARNING("writing to output stream failed! data may be lost");
}
return rv;