anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Further amend fb7b7e52

Browse Source 
This restores the previous behavior of runCommand().
When the child process could not be properly terminated the
error "RunCommand: could not terminate child process" was being
issued. However, in fb7b7e52 there was a misinterpretation
between this condition and the exit status of the child and
these two different errors were mixed up. They are now
disentangled again.
This commit is contained in:
Enrico Forestieri 2022-12-11 14:58:42 +01:00
parent 163844a6d0
commit e18709b176
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/support/filetools.cpp
View File

@ -1141,11 +1141,13 @@ cmd_ret const runCommand(string const & cmd)
DWORD pret;
BOOL success = GetExitCodeProcess(process.hProcess, &pret);
bool valid = (pret == 0) && success;
if (!success)
pret = -1;
if (!infile.empty())
CloseHandle(startup.hStdInput);
CloseHandle(process.hProcess);
if (fclose(inf) != 0)
valid = false;
pret = -1;
#elif defined (HAVE_PCLOSE)
int const pret = pclose(inf);
bool const valid = (WEXITSTATUS(pret) == 0);
@ -1156,7 +1158,7 @@ cmd_ret const runCommand(string const & cmd)
#error No pclose() function.
#endif
if (!valid)
if (pret == -1)
perror("RunCommand: could not terminate child process");
return { valid, result };