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

bug# 62361 fix profile migration when running remotely on a unix system

Browse Source 
r=ccarlen@netscape.com sr=bienvenu@netscape.com
This commit is contained in:
jgaunt%netscape.com 2001-01-26 22:44:55 +00:00
parent 3147e1efe0
commit e0065abf64
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
profile/src/nsProfileAccess.cpp
View File

@ -50,9 +50,11 @@
#if defined (XP_UNIX) #if defined (XP_UNIX)
#define USER_ENVIRONMENT_VARIABLE "USER" #define USER_ENVIRONMENT_VARIABLE "USER"
#define LOGNAME_ENVIRONMENT_VARIABLE "LOGNAME"
#define HOME_ENVIRONMENT_VARIABLE "HOME" #define HOME_ENVIRONMENT_VARIABLE "HOME"
#define PROFILE_NAME_ENVIRONMENT_VARIABLE "PROFILE_NAME" #define PROFILE_NAME_ENVIRONMENT_VARIABLE "PROFILE_NAME"
#define PROFILE_HOME_ENVIRONMENT_VARIABLE "PROFILE_HOME" #define PROFILE_HOME_ENVIRONMENT_VARIABLE "PROFILE_HOME"
#define DEFAULT_UNIX_PROFILE_NAME "default"
#elif defined (XP_BEOS) #elif defined (XP_BEOS)
#endif #endif
@ -1013,8 +1015,6 @@ nsProfileAccess::ProfileExists(const PRUnichar *profileName)
nsresult nsresult
nsProfileAccess::Get4xProfileInfo(const char *registryName) nsProfileAccess::Get4xProfileInfo(const char *registryName)
{ {
NS_ASSERTION(registryName, "Invalid registryName");
nsresult rv = NS_OK; nsresult rv = NS_OK;
mNumOldProfiles = 0; mNumOldProfiles = 0;
@ -1023,6 +1023,8 @@ nsProfileAccess::Get4xProfileInfo(const char *registryName)
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
#if defined(XP_PC) || defined(XP_MAC) #if defined(XP_PC) || defined(XP_MAC)
NS_ASSERTION(registryName, "Invalid registryName");
nsCOMPtr<nsIRegistry> oldReg(do_CreateInstance(NS_REGISTRY_CONTRACTID, &rv)); nsCOMPtr<nsIRegistry> oldReg(do_CreateInstance(NS_REGISTRY_CONTRACTID, &rv));
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
rv = oldReg->Open(registryName); rv = oldReg->Open(registryName);
@ -1119,16 +1121,22 @@ nsProfileAccess::Get4xProfileInfo(const char *registryName)
#elif defined (XP_BEOS) #elif defined (XP_BEOS)
#else #else
/* XP_UNIX */ /* XP_UNIX */
char *unixProfileName = PR_GetEnv(PROFILE_NAME_ENVIRONMENT_VARIABLE); nsCAutoString unixProfileName( PR_GetEnv(PROFILE_NAME_ENVIRONMENT_VARIABLE) );
char *unixProfileDirectory = PR_GetEnv(PROFILE_HOME_ENVIRONMENT_VARIABLE); nsCAutoString unixProfileDirectory( PR_GetEnv(PROFILE_HOME_ENVIRONMENT_VARIABLE) );
if (!unixProfileName || if (!unixProfileName ||
!unixProfileDirectory || !unixProfileDirectory ||
(PL_strlen(unixProfileName) == 0) || (PL_strlen(unixProfileName) == 0) ||
(PL_strlen(unixProfileDirectory) == 0)) (PL_strlen(unixProfileDirectory) == 0))
{ {
unixProfileName = PR_GetEnv(USER_ENVIRONMENT_VARIABLE);
unixProfileDirectory = PR_GetEnv(HOME_ENVIRONMENT_VARIABLE); unixProfileDirectory = PR_GetEnv(HOME_ENVIRONMENT_VARIABLE);
unixProfileName = PR_GetEnv(LOGNAME_ENVIRONMENT_VARIABLE);
if ( !unixProfileName || (PL_strlen(unixProfileName) == 0) ) {
unixProfileName = PR_GetEnv(USER_ENVIRONMENT_VARIABLE);
}
if ( !unixProfileName || (PL_strlen(unixProfileName) == 0) ) {
unixProfileName = DEFAULT_UNIX_PROFILE_NAME;
}
} }
PRBool exists = PR_FALSE;; PRBool exists = PR_FALSE;;