summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2008-10-23 20:07:50 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2008-10-23 20:07:50 +0000
commit6950d0c4d41646ced7e92a6b26588c0bc32c91c2 (patch)
treebfd79403a57d09fe537bde61e96d936f41f008f3
parentc8c3c4149b0fcf35b68b9c4c96bebd33cdd37ea6 (diff)
downloadATCD-6950d0c4d41646ced7e92a6b26588c0bc32c91c2.tar.gz
ChangeLogTag:Thu
-rw-r--r--ACE/ChangeLog4
-rw-r--r--ACE/ace/Process.cpp16
2 files changed, 13 insertions, 7 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 242ef7302a5..a60557d3498 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct 23 20:06:02 UTC 2008 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu>
+
+ * ace/Process.cpp: Fixed a typo.
+
Thu Oct 23 15:15:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/fuzz.pl:
diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp
index e46b7bf10ff..ff2b7986e66 100644
--- a/ACE/ace/Process.cpp
+++ b/ACE/ace/Process.cpp
@@ -455,14 +455,16 @@ ACE_Process::spawn (ACE_Process_Options &options)
ACE_OS::close (options.get_stdin ());
ACE_OS::close (options.get_stdout ());
ACE_OS::close (options.get_stderr ());
- if (!options.handle_inheritence()) {
- // Set close-on-exec for all FDs except standard handles
- for (int i = ACE::max_handles () - 1; i >= 0; i--) {
- if ((i == ACE_STDIN) || (i == ACE_STDOUT) || (i == ACE_STDERR))
- continue;
- ACE_OS::fcntl (i, F_SETFD, FD_CLOEXEC);
+ if (!options.handle_inheritance ())
+ {
+ // Set close-on-exec for all FDs except standard handles
+ for (int i = ACE::max_handles () - 1; i >= 0; i--)
+ {
+ if (i == ACE_STDIN || i == ACE_STDOUT || i == ACE_STDERR)
+ continue;
+ ACE_OS::fcntl (i, F_SETFD, FD_CLOEXEC);
+ }
}
- }
// If we must, set the working directory for the child
// process.