From 9b33201e727b8c1ac0eef08624ebff5b60c9ffd7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 19 Mar 2018 11:09:52 -0500 Subject: [PATCH] util: rename stdout/stdin members to avoid conflicts w/standard macro (cherry picked from commit c389a7fb617ed7bcd617efa68c6a48c00405310d) --- src/libutil/util.cc | 14 +++++++------- src/libutil/util.hh | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/libutil/util.cc b/src/libutil/util.cc index 37a35ab23..764b4e442 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -931,7 +931,7 @@ std::pair runProgram(const RunOptions & options_) { RunOptions options(options_); StringSink sink; - options.stdout = &sink; + options.standardOut = &sink; int status = 0; @@ -948,10 +948,10 @@ void runProgram2(const RunOptions & options) { checkInterrupt(); - assert(!(options.stdin && options.input)); + assert(!(options.standardIn && options.input)); std::unique_ptr source_; - Source * source = options.stdin; + Source * source = options.standardIn; if (options.input) { source_ = std::make_unique(*options.input); @@ -960,12 +960,12 @@ void runProgram2(const RunOptions & options) /* Create a pipe. */ Pipe out, in; - if (options.stdout) out.create(); + if (options.standardOut) out.create(); if (source) in.create(); /* Fork. */ 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"); if (source && dup2(in.readSide.get(), STDIN_FILENO) == -1) throw SysError("dupping stdin"); @@ -1017,8 +1017,8 @@ void runProgram2(const RunOptions & options) }); } - if (options.stdout) - drainFD(out.readSide.get(), *options.stdout); + if (options.standardOut) + drainFD(out.readSide.get(), *options.standardOut); /* Wait for the child to finish. */ int status = pid.wait(); diff --git a/src/libutil/util.hh b/src/libutil/util.hh index 1ea1027ac..85952535d 100644 --- a/src/libutil/util.hh +++ b/src/libutil/util.hh @@ -260,8 +260,8 @@ struct RunOptions bool searchPath = true; Strings args; std::experimental::optional input; - Source * stdin = nullptr; - Sink * stdout = nullptr; + Source * standardIn = nullptr; + Sink * standardOut = nullptr; bool _killStderr = false; RunOptions(const Path & program, const Strings & args)