Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-21 17:59:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Part of fix for bug # 24416: use temp file when writing out bookmarks to try and reduce loss of data due to any crashes.

Browse Source
This commit is contained in:
rjc%netscape.com 2000-02-03 23:34:55 +00:00
parent 5816b366ff
commit 25b9ae78b1
2 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xpfe/browser/resources/content/navigator.js
View File

@ -182,7 +182,19 @@ function createBrowserInstance()
}
}
function Shutdown() {
function Shutdown()
{
try
{
// If bookmarks are dirty, flush 'em to disk
var bmks = Components.classes["component://netscape/browser/bookmarks-service"].getService();
if (bmks) bmks = bmks.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
if (bmks) bmks.Flush();
}
catch (ex)
{
}
// Close the app core.
if ( appCore ) {
appCore.close();

36
xpfe/components/bookmarks/src/nsBookmarksService.cpp
View File

@ -18,7 +18,9 @@
* Rights Reserved.
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
* Robert Churchill <rjc@netscape.com>
* Chris Waterson <waterson@netscape.com>
* Pierre Phaneuf <pp@ludusdesign.com>
*/
#define NS_IMPL_IDS
@ -2333,7 +2335,8 @@ nsBookmarksService::OnStopRequest(nsIChannel* channel, nsISupports *ctxt,
}
NS_ASSERTION(rv == NS_RDF_ASSERTION_ACCEPTED, "unable to assert new time");
mDirty = PR_TRUE;
// don't mark dirty [i.e. don't force a flush()]
// mDirty = PR_TRUE;
}
else
{
@ -2659,7 +2662,8 @@ nsBookmarksService::UpdateBookmarkLastVisitedDate(const char *aURL)
NS_ASSERTION(rv == NS_RDF_ASSERTION_ACCEPTED, "unable to Unassert changed status");
}
mDirty = PR_TRUE;
// don't mark dirty [i.e. don't force a flush()]
// mDirty = PR_TRUE;
}
}
}
@ -3761,7 +3765,7 @@ nsBookmarksService::WriteBookmarks(nsIRDFDataSource *ds, nsIRDFResource *root)
{
nsresult rv;
nsFileSpec bookmarksFile;
nsFileSpec bookmarksFile;
rv = GetBookmarksFile(&bookmarksFile);
// Oh well, couldn't get the bookmarks file. Guess there
@ -3769,8 +3773,13 @@ nsBookmarksService::WriteBookmarks(nsIRDFDataSource *ds, nsIRDFResource *root)
if (NS_FAILED(rv))
return NS_OK;
// Write out bookmarks to a temp file, then shuffle files around
// to help prevent data loss if we crash, for example
nsFileSpec bookmarksTempFile = bookmarksFile;
bookmarksTempFile.MakeUnique();
rv = NS_ERROR_FAILURE;
nsOutputFileStream strm(bookmarksFile);
nsOutputFileStream strm(bookmarksTempFile);
if (strm.is_open())
{
strm << "<!DOCTYPE NETSCAPE-Bookmark-file-1>\n";
@ -3786,6 +3795,23 @@ nsBookmarksService::WriteBookmarks(nsIRDFDataSource *ds, nsIRDFResource *root)
rv = WriteBookmarksContainer(ds, strm, root, 0);
mDirty = PR_FALSE;
// remove the current bookmark file, and then move the new/temp
// bookmark file into its place
char *bookmarksLeaf = bookmarksFile.GetLeafName();
if (bookmarksLeaf)
{
if (bookmarksFile.Exists())
{
bookmarksFile.Delete(PR_FALSE);
}
bookmarksTempFile.Rename(bookmarksLeaf);
nsCRT::free(bookmarksLeaf);
}
#ifdef DEBUG
printf("Bookmarks.html was written out to disk.\n");
#endif
}
return(rv);
}