about summary refs log tree commit diff
path: root/src/libutil
diff options
context:
space:
mode:
authorRok Garbas <rok@garbas.si>2015-05-13T07·37+0200
committerRok Garbas <rok@garbas.si>2015-05-13T07·37+0200
commitdad754843aad61ea4e92e4c3111ca432de4511f5 (patch)
treebbc6c6c043ab09ab825a30852a631fdd37bf9884 /src/libutil
parent000de699e9fd2a64ab748fc9a5103e9ecfcea4a5 (diff)
cygwin: looks like stdout/stdin are reserved words
Diffstat (limited to 'src/libutil')
-rw-r--r--src/libutil/util.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index ab0a3b303076..5cda9a0677b5 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -942,16 +942,16 @@ string runProgram(Path program, bool searchPath, const Strings & args,
     checkInterrupt();
 
     /* Create a pipe. */
-    Pipe stdout, stdin;
-    stdout.create();
-    if (!input.empty()) stdin.create();
+    Pipe out, in;
+    out.create();
+    if (!input.empty()) in.create();
 
     /* Fork. */
     Pid pid = startProcess([&]() {
-        if (dup2(stdout.writeSide, STDOUT_FILENO) == -1)
+        if (dup2(out.writeSide, STDOUT_FILENO) == -1)
             throw SysError("dupping stdout");
         if (!input.empty()) {
-            if (dup2(stdin.readSide, STDIN_FILENO) == -1)
+            if (dup2(in.readSide, STDIN_FILENO) == -1)
                 throw SysError("dupping stdin");
         }
 
@@ -967,16 +967,16 @@ string runProgram(Path program, bool searchPath, const Strings & args,
         throw SysError(format("executing ‘%1%’") % program);
     });
 
-    stdout.writeSide.close();
+    out.writeSide.close();
 
     /* FIXME: This can deadlock if the input is too long. */
     if (!input.empty()) {
-        stdin.readSide.close();
-        writeFull(stdin.writeSide, input);
-        stdin.writeSide.close();
+        in.readSide.close();
+        writeFull(in.writeSide, input);
+        in.writeSide.close();
     }
 
-    string result = drainFD(stdout.readSide);
+    string result = drainFD(out.readSide);
 
     /* Wait for the child to finish. */
     int status = pid.wait(true);