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

Create the install log in the user's profile directory if we don't have permission to write to the program directory.

Browse Source 
[nsbeta3+ b=48225; r=ssu]
This commit is contained in:
sgehani%netscape.com 2000-09-06 21:28:20 +00:00
parent 3c68a44dbd
commit 47d6db4ab3
1 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
xpinstall/src/nsLoggingProgressNotifier.cpp
View File

@ -32,9 +32,15 @@
#include "nsFileStream.h"
#include "nsDirectoryService.h"
#include "nsDirectoryServiceDefs.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nspr.h"
#ifdef XP_MAC
#define INSTALL_LOG "Install Log"
#else
#define INSTALL_LOG "install.log"
#endif
nsLoggingProgressListener::nsLoggingProgressListener()
@ -82,26 +88,59 @@ nsLoggingProgressListener::BeforeJavascriptEvaluation(const PRUnichar *URL)
if (NS_FAILED(rv)) return rv;
if (!nsSoftwareUpdate::GetLogName())
{
#ifdef XP_MAC
rv = iFile->Append("Install Log");
#else
rv = iFile->Append("install.log");
#endif
}
rv = iFile->Append(INSTALL_LOG);
else
rv = iFile->Append(nsSoftwareUpdate::GetLogName());
if (NS_FAILED(rv)) return rv;
// create log file if it doesn't exist (to work around a mac filespec bug)
PRBool bExists = PR_FALSE;
PRBool bExists = PR_FALSE, bTryProfileDir = PR_FALSE, bWritable = PR_FALSE;
rv = iFile->Exists(&bExists);
if (NS_FAILED(rv)) return rv;
if (!bExists)
{
rv = iFile->Create(nsIFile::NORMAL_FILE_TYPE, 0644);
if (NS_FAILED(rv))
bTryProfileDir = PR_TRUE;
}
if (!bTryProfileDir)
{
rv = iFile->IsWritable(&bWritable);
if (NS_FAILED(rv) || !bWritable)
bTryProfileDir = PR_TRUE;
}
if (bTryProfileDir)
{
// failed to create the log file in the application directory
// so try to create the log file in the user's profile directory
NS_WITH_SERVICE(nsIProperties, dirSvc,
NS_DIRECTORY_SERVICE_PROGID, &rv);
if (!dirSvc) return NS_ERROR_FAILURE;
dirSvc->Get(NS_APP_USER_PROFILE_50_DIR, NS_GET_IID(nsIFile),
getter_AddRefs(iFile));
if (!nsSoftwareUpdate::GetLogName())
rv = iFile->Append(INSTALL_LOG);
else
rv = iFile->Append(nsSoftwareUpdate::GetLogName());
if (NS_FAILED(rv)) return rv;
bExists = PR_FALSE;
bWritable = PR_FALSE;
rv = iFile->Exists(&bExists);
if (NS_FAILED(rv)) return rv;
if (!bExists)
{
rv = iFile->Create(nsIFile::NORMAL_FILE_TYPE, 0644);
if (NS_FAILED(rv)) return rv;
}
rv = iFile->IsWritable(&bWritable);
if (NS_FAILED(rv) || !bWritable) return NS_ERROR_FAILURE;
}
rv = Convert_nsIFile_To_nsFileSpec(iFile, &logFile);