mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

base::LaunchOptions fds_to_remap is no longer a pointer

Browse source 
https://codereview.chromium.org/2950153002
This commit is contained in:
deepak1556 2017-11-27 12:16:36 +05:30 committed by Cheng Zhao
parent 248d572077
commit 62635f43f4
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/relauncher.cc
View file

@ -87,15 +87,12 @@ bool RelaunchAppWithHelper(const base::FilePath& helper,
internal::kRelauncherSyncFD != STDOUT_FILENO && internal::kRelauncherSyncFD != STDOUT_FILENO &&
internal::kRelauncherSyncFD != STDERR_FILENO, internal::kRelauncherSyncFD != STDERR_FILENO,
"kRelauncherSyncFD must not conflict with stdio fds"); "kRelauncherSyncFD must not conflict with stdio fds");
base::FileHandleMappingVector fd_map;
fd_map.push_back(
std::make_pair(pipe_write_fd.get(), internal::kRelauncherSyncFD));
#endif #endif
base::LaunchOptions options; base::LaunchOptions options;
#if defined(OS_POSIX) #if defined(OS_POSIX)
options.fds_to_remap = &fd_map; options.fds_to_remap.push_back(
std::make_pair(pipe_write_fd.get(), internal::kRelauncherSyncFD));
base::Process process = base::LaunchProcess(relaunch_argv, options); base::Process process = base::LaunchProcess(relaunch_argv, options);
#elif defined(OS_WIN) #elif defined(OS_WIN)
base::Process process = base::LaunchProcess( base::Process process = base::LaunchProcess(

7
atom/browser/relauncher_mac.cc
View file

@ -82,13 +82,12 @@ int LaunchProgram(const StringVector& relauncher_args,
// Redirect the stdout of child process to /dev/null, otherwise after // Redirect the stdout of child process to /dev/null, otherwise after
// relaunch the child process will raise exception when writing to stdout. // relaunch the child process will raise exception when writing to stdout.
base::ScopedFD devnull(HANDLE_EINTR(open("/dev/null", O_WRONLY))); base::ScopedFD devnull(HANDLE_EINTR(open("/dev/null", O_WRONLY)));
base::FileHandleMappingVector no_stdout;
no_stdout.push_back(std::make_pair(devnull.get(), STDERR_FILENO));
no_stdout.push_back(std::make_pair(devnull.get(), STDOUT_FILENO));
base::LaunchOptions options; base::LaunchOptions options;
options.new_process_group = true; // detach options.new_process_group = true; // detach
options.fds_to_remap = &no_stdout; options.fds_to_remap.push_back(std::make_pair(devnull.get(), STDERR_FILENO));
options.fds_to_remap.push_back(std::make_pair(devnull.get(), STDOUT_FILENO));
base::Process process = base::LaunchProcess(argv, options); base::Process process = base::LaunchProcess(argv, options);
return process.IsValid() ? 0 : 1; return process.IsValid() ? 0 : 1;
} }