pengjunjie/desktop-sdk
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-sdk.git synced 2026-03-31 10:23:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix external processes

Browse Source
This commit is contained in:
Oleg.Korshul
2025-09-18 12:12:35 +03:00
parent 55665e8064
commit f294ebf87b
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ChromiumBasedEditors/lib/src/cefwrapper/external_process_with_childs.h
View File

@ -129,17 +129,16 @@ namespace NSProcesses
while (true)
{
NSThreads::Sleep(500);
wpid = waitpid(-m_pid, &status, 0);
if (wpid > 0)
{
NSThreads::Sleep(500);
continue;
}
else if (wpid == -1)
{
if (errno == EINTR)
{
NSThreads::Sleep(500);
continue;
}
break;
@ -302,14 +301,31 @@ namespace NSProcesses
argv.push_back(const_cast<char*>(s.c_str()));
argv.push_back(nullptr);
std::map<std::string, std::string> mergedEnv;
for (char **env = environ; *env; ++env)
{
std::string s(*env);
auto pos = s.find('=');
if (pos != std::string::npos)
{
mergedEnv[s.substr(0, pos)] = s.substr(pos + 1);
}
}
for (auto &kv : m_env)
{
mergedEnv[kv.first] = kv.second;
}
std::vector<std::string> envStrings;
std::vector<char*> envp;
for (char** env = environ; *env; ++env)
envStrings.push_back(*env);
for (auto& kv : m_env)
for (auto &kv : mergedEnv)
{
envStrings.push_back(kv.first + "=" + kv.second);
for (auto& s : envStrings)
}
for (auto &s : envStrings)
{
envp.push_back(const_cast<char*>(s.c_str()));
}
envp.push_back(nullptr);
std::string sProgramm(argv[0]);
@ -330,11 +346,11 @@ namespace NSProcesses
std::thread t_out = std::thread([this]()
{
readOutLoop(m_stdoutPipe[0], StreamType::StdOut);
readOutLoop(m_stdoutPipe[0], StreamType::StdOut);
});
std::thread t_err = std::thread([this]()
{
readOutLoop(m_stderrPipe[0], StreamType::StdErr);
readOutLoop(m_stderrPipe[0], StreamType::StdErr);
});
#endif