system/FileDescriptor: move O_NOCTTY|O_CLOEXEC to Open()

ddyeakley · Mar 3, 2015 · 4dec12f · 4dec12f
1 parent 57ad3ac
commit 4dec12f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/system/FileDescriptor.cxx b/src/system/FileDescriptor.cxx
@@ -60,22 +60,22 @@
 bool
 FileDescriptor::Open(const char *pathname, int flags)
 {
-	fd = ::open(pathname, flags);
+	fd = ::open(pathname, flags | O_NOCTTY | O_CLOEXEC);
 	return IsDefined();
 }
 
 bool
 FileDescriptor::OpenReadOnly(const char *pathname)
 {
-	return Open(pathname, O_RDONLY | O_NOCTTY | O_CLOEXEC);
+	return Open(pathname, O_RDONLY);
 }
 
 #ifndef WIN32
 
 bool
 FileDescriptor::OpenNonBlocking(const char *pathname)
 {
-	return Open(pathname, O_RDWR | O_NOCTTY | O_CLOEXEC | O_NONBLOCK);
+	return Open(pathname, O_RDWR | O_NONBLOCK);
 }
 
 bool