lehmanator/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

cygwin: looks like stdout/stdin are reserved words

Browse source
This commit is contained in:
Rok Garbas 2015-05-13 09:37:56 +02:00
parent 000de699e9
commit dad754843a
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/libutil/util.cc
View file

@ -942,16 +942,16 @@ string runProgram(Path program, bool searchPath, const Strings & args,
checkInterrupt(); checkInterrupt();
/* Create a pipe. */ /* Create a pipe. */
Pipe stdout, stdin; Pipe out, in;
stdout.create(); out.create();
if (!input.empty()) stdin.create(); if (!input.empty()) in.create();
/* Fork. */ /* Fork. */
Pid pid = startProcess([&]() { Pid pid = startProcess([&]() {
if (dup2(stdout.writeSide, STDOUT_FILENO) == -1) if (dup2(out.writeSide, STDOUT_FILENO) == -1)
throw SysError("dupping stdout"); throw SysError("dupping stdout");
if (!input.empty()) { if (!input.empty()) {
if (dup2(stdin.readSide, STDIN_FILENO) == -1) if (dup2(in.readSide, STDIN_FILENO) == -1)
throw SysError("dupping stdin"); throw SysError("dupping stdin");
} }
@ -967,16 +967,16 @@ string runProgram(Path program, bool searchPath, const Strings & args,
throw SysError(format("executing ‘%1%’") % program); throw SysError(format("executing ‘%1%’") % program);
}); });
stdout.writeSide.close(); out.writeSide.close();
/* FIXME: This can deadlock if the input is too long. */ /* FIXME: This can deadlock if the input is too long. */
if (!input.empty()) { if (!input.empty()) {
stdin.readSide.close(); in.readSide.close();
writeFull(stdin.writeSide, input); writeFull(in.writeSide, input);
stdin.writeSide.close(); in.writeSide.close();
} }
string result = drainFD(stdout.readSide); string result = drainFD(out.readSide);
/* Wait for the child to finish. */ /* Wait for the child to finish. */
int status = pid.wait(true); int status = pid.wait(true);