зеркало из https://github.com/mozilla/pjs.git
creating ~/.mozilla under unix if not already there.
This commit is contained in:
dp%netscape.com
Родитель
e2c0e1da24
Коммит
e4d775b1e6
|
|
@ -145,7 +145,6 @@ nsComponentManagerImpl::nsComponentManagerImpl()
|
|||
|
||||
nsresult nsComponentManagerImpl::Init(void)
|
||||
{
|
||||
nsresult rv;
|
||||
if (mFactories == NULL) {
|
||||
mFactories = new nsHashtable();
|
||||
if (mFactories == NULL)
|
||||
|
|
@ -176,16 +175,53 @@ nsresult nsComponentManagerImpl::Init(void)
|
|||
#endif
|
||||
|
||||
#ifdef USE_NSREG
|
||||
NR_StartupRegistry(); // XXX check error?
|
||||
|
||||
#ifdef XP_UNIX
|
||||
// Create ~/.mozilla as that is the default place for the registry file
|
||||
|
||||
/* The default registry on the unix system is $HOME/.mozilla/registry per
|
||||
* vr_findGlobalRegName(). vr_findRegFile() will create the registry file
|
||||
* if it doesn't exist. But it wont create directories.
|
||||
*
|
||||
* Hence we need to create the directory if it doesn't exist already.
|
||||
*
|
||||
* Why create it here as opposed to the app ?
|
||||
* ------------------------------------------
|
||||
* The app cannot create the directory in main() as most of the registry
|
||||
* and initialization happens due to use of static variables.
|
||||
* And we dont want to be dependent on the order in which
|
||||
* these static stuff happen.
|
||||
*
|
||||
* Permission for the $HOME/.mozilla will be Read,Write,Execute
|
||||
* for user only. Nothing to group and others.
|
||||
*/
|
||||
char *home = getenv("HOME");
|
||||
if (home != NULL)
|
||||
{
|
||||
char dotMozillaDir[1024];
|
||||
PR_snprintf(dotMozillaDir, sizeof(dotMozillaDir),
|
||||
"%s/" NS_MOZILLA_DIR_NAME, home);
|
||||
if (PR_Access(dotMozillaDir, PR_ACCESS_EXISTS) != PR_SUCCESS)
|
||||
{
|
||||
PR_MkDir(dotMozillaDir, NS_MOZILLA_DIR_PERMISSION);
|
||||
printf("nsComponentManager: Creating Directory %s\n", dotMozillaDir);
|
||||
PR_LOG(nsComponentManagerLog, PR_LOG_ALWAYS,
|
||||
("nsComponentManager: Creating Directory %s", dotMozillaDir));
|
||||
}
|
||||
}
|
||||
#endif /* XP_UNIX */
|
||||
|
||||
// No error checking on the following because the program
|
||||
// can work perfectly well even if no registry is available.
|
||||
|
||||
NR_StartupRegistry();
|
||||
|
||||
// Check the version of registry. Nuke old versions.
|
||||
rv = PlatformVersionCheck();
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
PlatformVersionCheck();
|
||||
#endif
|
||||
|
||||
// Initiate autoreg
|
||||
rv = AutoRegister(NS_Startup, NULL);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
AutoRegister(NS_Startup, NULL);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -177,6 +177,28 @@ protected:
|
|||
|
||||
#define NS_ERROR_IS_DIR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XPCOM, 24)
|
||||
|
||||
#ifdef XP_UNIX
|
||||
/* The default registry on the unix system is $HOME/.mozilla/registry per
|
||||
* vr_findGlobalRegName(). vr_findRegFile() will create the registry file
|
||||
* if it doesn't exist. But it wont create directories.
|
||||
*
|
||||
* Hence we need to create the directory if it doesn't exist already.
|
||||
*
|
||||
* Why create it here as opposed to the app ?
|
||||
* ------------------------------------------
|
||||
* The app cannot create the directory in main() as most of the registry
|
||||
* and initialization happens due to use of static variables.
|
||||
* And we dont want to be dependent on the order in which
|
||||
* these static stuff happen.
|
||||
*
|
||||
* Permission for the $HOME/.mozilla will be Read,Write,Execute
|
||||
* for user only. Nothing to group and others.
|
||||
*/
|
||||
#define NS_MOZILLA_DIR_NAME ".mozilla"
|
||||
#define NS_MOZILLA_DIR_PERMISSION 00700
|
||||
#endif /* XP_UNIX */
|
||||
|
||||
|
||||
/**
|
||||
* When using the registry we put a version number in it.
|
||||
* If the version number that is in the registry doesn't match
|
||||
|
|
|
|||
|
|
@ -145,7 +145,6 @@ nsComponentManagerImpl::nsComponentManagerImpl()
|
|||
|
||||
nsresult nsComponentManagerImpl::Init(void)
|
||||
{
|
||||
nsresult rv;
|
||||
if (mFactories == NULL) {
|
||||
mFactories = new nsHashtable();
|
||||
if (mFactories == NULL)
|
||||
|
|
@ -176,16 +175,53 @@ nsresult nsComponentManagerImpl::Init(void)
|
|||
#endif
|
||||
|
||||
#ifdef USE_NSREG
|
||||
NR_StartupRegistry(); // XXX check error?
|
||||
|
||||
#ifdef XP_UNIX
|
||||
// Create ~/.mozilla as that is the default place for the registry file
|
||||
|
||||
/* The default registry on the unix system is $HOME/.mozilla/registry per
|
||||
* vr_findGlobalRegName(). vr_findRegFile() will create the registry file
|
||||
* if it doesn't exist. But it wont create directories.
|
||||
*
|
||||
* Hence we need to create the directory if it doesn't exist already.
|
||||
*
|
||||
* Why create it here as opposed to the app ?
|
||||
* ------------------------------------------
|
||||
* The app cannot create the directory in main() as most of the registry
|
||||
* and initialization happens due to use of static variables.
|
||||
* And we dont want to be dependent on the order in which
|
||||
* these static stuff happen.
|
||||
*
|
||||
* Permission for the $HOME/.mozilla will be Read,Write,Execute
|
||||
* for user only. Nothing to group and others.
|
||||
*/
|
||||
char *home = getenv("HOME");
|
||||
if (home != NULL)
|
||||
{
|
||||
char dotMozillaDir[1024];
|
||||
PR_snprintf(dotMozillaDir, sizeof(dotMozillaDir),
|
||||
"%s/" NS_MOZILLA_DIR_NAME, home);
|
||||
if (PR_Access(dotMozillaDir, PR_ACCESS_EXISTS) != PR_SUCCESS)
|
||||
{
|
||||
PR_MkDir(dotMozillaDir, NS_MOZILLA_DIR_PERMISSION);
|
||||
printf("nsComponentManager: Creating Directory %s\n", dotMozillaDir);
|
||||
PR_LOG(nsComponentManagerLog, PR_LOG_ALWAYS,
|
||||
("nsComponentManager: Creating Directory %s", dotMozillaDir));
|
||||
}
|
||||
}
|
||||
#endif /* XP_UNIX */
|
||||
|
||||
// No error checking on the following because the program
|
||||
// can work perfectly well even if no registry is available.
|
||||
|
||||
NR_StartupRegistry();
|
||||
|
||||
// Check the version of registry. Nuke old versions.
|
||||
rv = PlatformVersionCheck();
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
PlatformVersionCheck();
|
||||
#endif
|
||||
|
||||
// Initiate autoreg
|
||||
rv = AutoRegister(NS_Startup, NULL);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
AutoRegister(NS_Startup, NULL);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -177,6 +177,28 @@ protected:
|
|||
|
||||
#define NS_ERROR_IS_DIR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XPCOM, 24)
|
||||
|
||||
#ifdef XP_UNIX
|
||||
/* The default registry on the unix system is $HOME/.mozilla/registry per
|
||||
* vr_findGlobalRegName(). vr_findRegFile() will create the registry file
|
||||
* if it doesn't exist. But it wont create directories.
|
||||
*
|
||||
* Hence we need to create the directory if it doesn't exist already.
|
||||
*
|
||||
* Why create it here as opposed to the app ?
|
||||
* ------------------------------------------
|
||||
* The app cannot create the directory in main() as most of the registry
|
||||
* and initialization happens due to use of static variables.
|
||||
* And we dont want to be dependent on the order in which
|
||||
* these static stuff happen.
|
||||
*
|
||||
* Permission for the $HOME/.mozilla will be Read,Write,Execute
|
||||
* for user only. Nothing to group and others.
|
||||
*/
|
||||
#define NS_MOZILLA_DIR_NAME ".mozilla"
|
||||
#define NS_MOZILLA_DIR_PERMISSION 00700
|
||||
#endif /* XP_UNIX */
|
||||
|
||||
|
||||
/**
|
||||
* When using the registry we put a version number in it.
|
||||
* If the version number that is in the registry doesn't match
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче