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

Part of fix for bug 163543 (prefs not saved between sessions): fix FSCopyObject to take a destination file name, and don't update the mFSRef of the nsLocalFile when making a copy. r=ccarlen/pinkerton.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/CHIMERA_M1_0_1_BRANCH@127923 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sfraser%netscape.com
2002-08-23 05:34:40 +00:00
parent 1ce90c0435
commit 9ebc8ac9d3
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/xpcom/io/nsLocalFileOSX.cpp
View File

@@ -577,7 +577,7 @@ NS_IMETHODIMP nsLocalFile::Remove(PRBool recursive)
err = ::FSDeleteContainer(&fsRef);
else
err = ::FSDeleteObject(&fsRef);
return MacErrorMapper(err);
}
@@ -2023,11 +2023,10 @@ nsresult nsLocalFile::MoveCopy(nsIFile* aParentDir, const nsAString& newName, PR
return rv;
if (isCopy) {
err = ::FSCopyObject(&srcRef, &destRef, 0, kFSCatInfoNone, false, false, nsnull, nsnull, &newRef);
if (err == noErr && !newName.IsEmpty())
err = ::FSRenameUnicode(&newRef, newName.Length(), PromiseFlatString(newName).get(), kTextEncodingUnknown, &newRef);
if (err == noErr)
mFSRef = newRef;
err = ::FSCopyObject(&srcRef, &destRef,
newName.Length(), newName.Length() ? PromiseFlatString(newName).get() : nsnull,
0, kFSCatInfoNone, false, false, nsnull, nsnull, &newRef);
// don't update mFSRef on a copy
}
else {
// First, try the quick way which works only within the same volume
@@ -2037,9 +2036,10 @@ nsresult nsLocalFile::MoveCopy(nsIFile* aParentDir, const nsAString& newName, PR
if (err == diffVolErr) {
// If on different volumes, resort to copy & delete
err = ::FSCopyObject(&srcRef, &destRef, 0, kFSCatInfoNone, false, false, nsnull, nsnull, &newRef);
if (err == noErr && !newName.IsEmpty())
err = ::FSRenameUnicode(&newRef, newName.Length(), PromiseFlatString(newName).get(), kTextEncodingUnknown, &newRef);
err = ::FSCopyObject(&srcRef, &destRef,
newName.Length(), newName.Length() ? PromiseFlatString(newName).get() : nsnull,
0, kFSCatInfoNone, false, false, nsnull, nsnull, &newRef);
if (err == noErr)
mFSRef = newRef;
err = ::FSDeleteObjects(&srcRef);