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

Fix GetProductDirectory. Add handling for the app registry so our new profile location actually works. Not part of the build.

Browse Source
This commit is contained in:
bryner%netscape.com 2002-08-26 10:18:41 +00:00
parent 445c25cd24
commit e18fbb8b89
2 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
toolkit/xre/nsXREDirProvider.cpp
View File

@ -44,12 +44,25 @@
#include "prenv.h"
#endif
// WARNING: These hard coded names need to go away. They need to
// come from localizable resources
#if defined(XP_MAC) || defined(XP_MACOSX)
#define APP_REGISTRY_NAME NS_LITERAL_CSTRING("Application Registry")
#elif defined(XP_WIN) || defined(XP_OS2)
#define APP_REGISTRY_NAME NS_LITERAL_CSTRING("registry.dat")
#else
#define APP_REGISTRY_NAME NS_LITERAL_CSTRING("appreg")
#endif
nsXREDirProvider::nsXREDirProvider(const nsACString& aProductName)
{
NS_INIT_ISUPPORTS();
mProductName.Assign(aProductName);
#ifdef XP_UNIX
ToLowerCase(mProductName);
mProductDir.Assign(NS_LITERAL_CSTRING(".") + aProductName);
ToLowerCase(mProductDir);
#else
mProductDir.Assign(aProductName);
#endif
}
@ -70,6 +83,11 @@ nsXREDirProvider::GetFile(const char* aProperty, PRBool* aPersistent,
if (!strcmp(aProperty, NS_APP_APPLICATION_REGISTRY_DIR))
rv = GetProductDirectory(getter_AddRefs(localFile));
else if (!strcmp(aProperty, NS_APP_APPLICATION_REGISTRY_FILE)) {
rv = GetProductDirectory(getter_AddRefs(localFile));
if (NS_SUCCEEDED(rv))
rv = localFile->AppendNative(APP_REGISTRY_NAME);
}
else if (!strcmp(aProperty, NS_APP_USER_PROFILES_ROOT_DIR)) {
rv = GetProductDirectory(getter_AddRefs(localFile));
NS_ENSURE_SUCCESS(rv, rv);
@ -80,13 +98,8 @@ nsXREDirProvider::GetFile(const char* aProperty, PRBool* aPersistent,
#endif
// We must create the profile directory here if it does not exist.
PRBool exists;
rv = localFile->Exists(&exists);
rv = EnsureDirectoryExists(localFile);
NS_ENSURE_SUCCESS(rv, rv);
if (!exists) {
rv = localFile->Create(nsIFile::DIRECTORY_TYPE, 0775);
NS_ENSURE_SUCCESS(rv, rv);
}
}
if (localFile)
@ -140,5 +153,24 @@ nsXREDirProvider::GetProductDirectory(nsILocalFile** aFile)
#endif
NS_ENSURE_SUCCESS(rv, rv);
rv = localDir->AppendRelativeNativePath(mProductDir);
NS_ENSURE_SUCCESS(rv, rv);
rv = EnsureDirectoryExists(localDir);
NS_ENSURE_SUCCESS(rv, rv);
*aFile = localDir;
NS_ADDREF(*aFile);
return NS_OK;
}
nsresult
nsXREDirProvider::EnsureDirectoryExists(nsILocalFile* aDirectory)
{
PRBool exists;
nsresult rv = aDirectory->Exists(&exists);
NS_ENSURE_SUCCESS(rv, rv);
if (!exists)
rv = aDirectory->Create(nsIFile::DIRECTORY_TYPE, 0775);
return rv;
}

3
toolkit/xre/nsXREDirProvider.h
View File

@ -55,8 +55,9 @@ public:
private:
nsresult GetProductDirectory(nsILocalFile** aFile);
nsresult EnsureDirectoryExists(nsILocalFile* aDirectory);
nsCString mProductName;
nsCString mProductDir;
};
#endif