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

Bug 762780 - crashreporter restart command should support MOZ_APP_LAUNCHER. r=ted

Browse Source
This commit is contained in:
Wolfgang Rosenauer 2012-06-20 17:41:34 +02:00
parent c26d688173
commit 90b16fd322
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
toolkit/crashreporter/nsExceptionHandler.cpp
View File

@ -1358,22 +1358,15 @@ SetRestartArgs(int argc, char** argv)
int i;
nsCAutoString envVar;
char *env;
char *argv0 = getenv("MOZ_APP_LAUNCHER");
for (i = 0; i < argc; i++) {
envVar = "MOZ_CRASHREPORTER_RESTART_ARG_";
envVar.AppendInt(i);
envVar += "=";
#if defined(XP_UNIX) && !defined(XP_MACOSX)
// we'd like to run the script around the binary
// instead of the binary itself, so remove the -bin
// if it exists on the first argument
int arg_len = 0;
if (i == 0 &&
(arg_len = strlen(argv[i])) > 4 &&
strcmp(argv[i] + arg_len - 4, "-bin") == 0) {
envVar.Append(argv[i], arg_len - 4);
} else
#endif
{
if (argv0 && i == 0) {
// Is there a request to suppress default binary launcher?
envVar += argv0;
} else {
envVar += argv[i];
}