Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug #8491. Reviewed scc, approved chofmann. Provide support for environment variables on the Mac so PR_Log can query for what modules are actually supposed to be logged. See the bug comments for a description of how to set the enviroment variables.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@38870 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sdagley%netscape.com
1999-07-09 02:44:31 +00:00
parent f7afa8b856
commit 59c686e098
4 changed files with 91 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp
View File

@@ -44,6 +44,7 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
// NSPR
#include "prmem.h"
#include "plstr.h"
#include "prenv.h"
// Universal
#include <AppleEvents.h>
@@ -139,6 +140,8 @@ private:
OSErr AddToCommandLine(const char* inOptionString,
const FSSpec& inFileSpec);
void AddToEnvironmentVars(const char* inArgText);
OSErr DispatchURLToNewBrowser(const char* url);
OSErr HandleOpenURLEvent(const AppleEvent &inAppleEvent,
@@ -488,6 +491,13 @@ OSErr nsAppleEventHandler::AddToCommandLine(const char* inArgText)
return noErr;
}
//----------------------------------------------------------------------------------------
void nsAppleEventHandler::AddToEnvironmentVars(const char* inArgText)
//----------------------------------------------------------------------------------------
{
(void)PR_PutEnv(inArgText);
}
//----------------------------------------------------------------------------------------
OSErr nsAppleEventHandler::HandleOpen1Doc(const FSSpec& inFileSpec, OSType inFileType)
//----------------------------------------------------------------------------------------
@@ -501,15 +511,34 @@ OSErr nsAppleEventHandler::HandleOpen1Doc(const FSSpec& inFileSpec, OSType inFil
nsInputFileStream s(inFileSpec);
if (s.is_open())
{
Boolean foundArgs = false;
char chars[1024];
s.readline(chars, sizeof(chars));
// Does the text in it have the right prefix?
const char* kCommandLinePrefix = "ARGS:";
if (PL_strstr(chars, kCommandLinePrefix) == chars)
{
return AddToCommandLine(chars + PL_strlen(kCommandLinePrefix));
// That's all we have to do.
}
const char* kEnvVarLinePrefix = "ENV:";
s.readline(chars, sizeof(chars));
do
{ // See if there are any command line or environment var settings
if (PL_strstr(chars, kCommandLinePrefix) == chars)
{
(void)AddToCommandLine(chars + PL_strlen(kCommandLinePrefix));
foundArgs = true;
}
else if (PL_strstr(chars, kEnvVarLinePrefix) == chars)
{
(void)AddToEnvironmentVars(chars + PL_strlen(kEnvVarLinePrefix));
foundArgs = true;
}
// Clear the buffer and get the next line from the command line file
chars[0] = '\0';
s.readline(chars, sizeof(chars));
} while (PL_strlen(chars));
// If we found a command line or environment vars we want to return now
// raather than trying to open the file as a URL
if (foundArgs)
return noErr;
}
}
// If it's not a command-line argument, and we are starting up the application,