github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct linux zygote process titles (#50533)

Browse Source 
* fix: correct linux zygote process titles

Co-authored-by: Mitchell Cohen <mitch.cohen@me.com>

* pass argv on mac as well

Co-authored-by: Mitchell Cohen <mitch.cohen@me.com>

* lint

Co-authored-by: Mitchell Cohen <mitch.cohen@me.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Mitchell Cohen <mitch.cohen@me.com>
This commit is contained in:
trop[bot]
2026-03-27 12:24:01 -04:00
committed by GitHub
parent 5559ffa184
commit ef7f35e15c
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shell/app/electron_library_main.mm
View File

@@ -10,6 +10,7 @@
#include "base/apple/scoped_nsautorelease_pool.h"
#include "base/at_exit.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/i18n/icu_util.h"
#include "base/notreached.h"
#include "content/public/app/content_main.h"
@@ -33,7 +34,10 @@ int ElectronMain(int argc, char* argv[]) {
delegate.OverrideFrameworkBundlePath();
delegate.SetUpBundleOverrides();
return content::ContentMain(content::ContentMainParams{&delegate});
content::ContentMainParams params{&delegate};
params.argc = argc;
params.argv = UNSAFE_BUFFERS(const_cast<const char**>(argv));
return content::ContentMain(std::move(params));
}
int ElectronInitializeICUandStartNode(int argc, char* argv[]) {

9
shell/app/electron_main_linux.cc
View File

@@ -6,6 +6,7 @@
#include "base/at_exit.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/i18n/icu_util.h"
#include "base/strings/cstring_view.h"
#include "content/public/app/content_main.h"
@@ -29,6 +30,9 @@ namespace {
int main(int argc, char* argv[]) {
FixStdioStreams();
// Chromium expects the original argv in its original memory location
// to update /proc/<pid>/cmdline.
const char** original_argv = UNSAFE_BUFFERS(const_cast<const char**>(argv));
argv = uv_setup_args(argc, argv);
base::CommandLine::Init(argc, argv);
electron::ElectronCommandLine::Init(argc, argv);
@@ -40,5 +44,8 @@ int main(int argc, char* argv[]) {
}
electron::ElectronMainDelegate delegate;
return content::ContentMain(content::ContentMainParams{&delegate});
content::ContentMainParams params{&delegate};
params.argc = argc;
params.argv = original_argv;
return content::ContentMain(std::move(params));
}