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

Bug 156814 If bookmark file is symlink, mozilla overwrites symlink with a file

Browse Source 
r=caillon sr=bz


git-svn-id: svn://10.0.0.236/trunk@235823 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org 2007-09-12 17:50:28 +00:00
parent ccb90f431d
commit 4a3e0cc2fd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/suite/browser/src/nsBookmarksService.cpp
View File

@ -5063,7 +5063,10 @@ nsBookmarksService::WriteBookmarks(nsFileSpec* aBookmarksFile, nsIRDFDataSource*
if (NS_FAILED(rv = NS_NewISupportsArray(getter_AddRefs(parentArray))))
return rv;
nsFileSpec tempFile(*aBookmarksFile);
nsFileSpec bookmarksFile(*aBookmarksFile);
PRBool ignored;
bookmarksFile.ResolveSymlink(ignored);
nsFileSpec tempFile(bookmarksFile);
tempFile.MakeUnique();
PRBool succeeded = PR_TRUE;
@ -5096,11 +5099,11 @@ nsBookmarksService::WriteBookmarks(nsFileSpec* aBookmarksFile, nsIRDFDataSource*
// then trash the old bookmarks file and rename the temp file so it takes
// its place.
if (succeeded) {
char* bookmarksFileName = aBookmarksFile->GetLeafName();
char* bookmarksFileName = bookmarksFile.GetLeafName();
char* tempBookmarksFileName = tempFile.GetLeafName();
// If tempFile == aBookmarksFile, we must not delete/rename
if (nsCRT::strcmp(bookmarksFileName, tempBookmarksFileName)) {
aBookmarksFile->Delete(PR_FALSE);
bookmarksFile.Delete(PR_FALSE);
tempFile.Rename(bookmarksFileName);
}