Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[not part of build] Fix cache directory creation logic again.

Browse Source
This commit is contained in:
beard%netscape.com 2001-03-09 17:14:02 +00:00
parent 5c527757fd
commit 1ec94db8a7
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
netwerk/cache/src/nsDiskCacheDevice.cpp vendored
View File

@ -87,6 +87,16 @@ static int PR_CALLBACK cacheCapacityChanged(const char *pref, void *closure)
return NS_OK;
}
static nsresult ensureCacheDirectory(nsIFile * cacheDirectory)
{
// make sure the Cache directory exists.
PRBool exists;
nsresult rv = cacheDirectory->Exists(&exists);
if (NS_SUCCEEDED(rv) && !exists)
rv = cacheDirectory->Create(nsIFile::DIRECTORY_TYPE, 0777);
return rv;
}
static nsresult installPrefListeners(nsDiskCacheDevice* device)
{
nsresult rv;
@ -94,7 +104,6 @@ static nsresult installPrefListeners(nsDiskCacheDevice* device)
if (NS_FAILED(rv))
return rv;
rv = prefs->RegisterCallback(CACHE_DISK_CAPACITY, cacheCapacityChanged, device);
if (NS_FAILED(rv))
return rv;
@ -134,11 +143,9 @@ static nsresult installPrefListeners(nsDiskCacheDevice* device)
if (NS_FAILED(rv))
return rv;
// make sure the Cache directory exists.
PRBool exists;
rv = cacheDirectory->Exists(&exists);
if (NS_SUCCEEDED(rv) && !exists)
cacheDirectory->Create(nsIFile::DIRECTORY_TYPE, 0777);
rv = ensureCacheDirectory(cacheDirectory);
if (NS_FAILED(rv))
return rv;
rv = prefs->SetFileXPref(CACHE_DIR_PREF, cacheDirectory);
if (NS_FAILED(rv))
@ -147,11 +154,11 @@ static nsresult installPrefListeners(nsDiskCacheDevice* device)
return rv;
#endif
} else {
// be a good citizen in the current Cache directory.
rv = cacheDirectory->Append("NewCache");
// always make sure the directory exists, the user may blow it away.
rv = ensureCacheDirectory(cacheDirectory);
if (NS_FAILED(rv))
return rv;
// cause the preference to be set up initially.
device->setCacheDirectory(cacheDirectory);
}