mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1989 from dtzWill/fix/avoid-reserved-standard-macros

Browse source 
util: rename stdout/stdin members to avoid conflicts w/standard macro
This commit is contained in:
Shea Levy 2018-03-19 11:14:28 -06:00 committed by GitHub
commit d53970d31b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libutil/util.cc
View file

@ -931,7 +931,7 @@ std::pair<int, std::string> runProgram(const RunOptions & options_)
{ {
RunOptions options(options_); RunOptions options(options_);
StringSink sink; StringSink sink;
options.stdout = &sink; options.standardOut = &sink;
int status = 0; int status = 0;
@ -948,10 +948,10 @@ void runProgram2(const RunOptions & options)
{ {
checkInterrupt(); checkInterrupt();
assert(!(options.stdin && options.input)); assert(!(options.standardIn && options.input));
std::unique_ptr<Source> source_; std::unique_ptr<Source> source_;
Source * source = options.stdin; Source * source = options.standardIn;
if (options.input) { if (options.input) {
source_ = std::make_unique<StringSource>(*options.input); source_ = std::make_unique<StringSource>(*options.input);
@ -960,12 +960,12 @@ void runProgram2(const RunOptions & options)
/* Create a pipe. */ /* Create a pipe. */
Pipe out, in; Pipe out, in;
if (options.stdout) out.create(); if (options.standardOut) out.create();
if (source) in.create(); if (source) in.create();
/* Fork. */ /* Fork. */
Pid pid = startProcess([&]() { Pid pid = startProcess([&]() {
if (options.stdout && dup2(out.writeSide.get(), STDOUT_FILENO) == -1) if (options.standardOut && dup2(out.writeSide.get(), STDOUT_FILENO) == -1)
throw SysError("dupping stdout"); throw SysError("dupping stdout");
if (source && dup2(in.readSide.get(), STDIN_FILENO) == -1) if (source && dup2(in.readSide.get(), STDIN_FILENO) == -1)
throw SysError("dupping stdin"); throw SysError("dupping stdin");
@ -1017,8 +1017,8 @@ void runProgram2(const RunOptions & options)
}); });
} }
if (options.stdout) if (options.standardOut)
drainFD(out.readSide.get(), *options.stdout); drainFD(out.readSide.get(), *options.standardOut);
/* Wait for the child to finish. */ /* Wait for the child to finish. */
int status = pid.wait(); int status = pid.wait();

4
src/libutil/util.hh
View file

@ -260,8 +260,8 @@ struct RunOptions
bool searchPath = true; bool searchPath = true;
Strings args; Strings args;
std::experimental::optional<std::string> input; std::experimental::optional<std::string> input;
Source * stdin = nullptr; Source * standardIn = nullptr;
Sink * stdout = nullptr; Sink * standardOut = nullptr;
bool _killStderr = false; bool _killStderr = false;
RunOptions(const Path & program, const Strings & args) RunOptions(const Path & program, const Strings & args)