commit 62343209339f871a5677740425c472de4fff5507
author Peter Collingbourne <peter@pcc.me.uk> Tue Jun 14 03:55:54 2011 +0000
committer Peter Collingbourne <peter@pcc.me.uk> Tue Jun 14 03:55:54 2011 +0000
tree 51c6ed0f92bfb3dfc543a6532fe09fa96f8ab721
parent 4aeb47e23c826087e91501d3c0167624d4ce3ada

Fix mistakes relating to ProcessMonitor::DupDescriptor

llvm-svn: 132971

lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp

diff --git a/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp b/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp
index 5bad483..0a42c8c 100644
--- a/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp
+++ b/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp
@@ -722,7 +722,7 @@
         // FIXME: If two or more of the paths are the same we needlessly open
         // the same file multiple times.
         if (stdin_path != NULL && stdin_path[0])
-            if (!DupDescriptor(stdin_path, STDIN_FILENO, O_RDONLY | O_CREAT))
+            if (!DupDescriptor(stdin_path, STDIN_FILENO, O_RDONLY))
                 exit(1);
 
         if (stdout_path != NULL && stdout_path[0])
@@ -730,7 +730,7 @@
                 exit(1);
 
         if (stderr_path != NULL && stderr_path[0])
-            if (!DupDescriptor(stderr_path, STDOUT_FILENO, O_WRONLY | O_CREAT))
+            if (!DupDescriptor(stderr_path, STDERR_FILENO, O_WRONLY | O_CREAT))
                 exit(1);
 
         // Execute.  We should never return.
@@ -1263,12 +1263,12 @@
 bool
 ProcessMonitor::DupDescriptor(const char *path, int fd, int flags)
 {
-    int target_fd = open(path, flags);
+    int target_fd = open(path, flags, 0666);
 
     if (target_fd == -1)
         return false;
 
-    return (dup2(fd, target_fd) == -1) ? false : true;
+    return (dup2(target_fd, fd) == -1) ? false : true;
 }
 
 void