summaryrefslogtreecommitdiffstats
path: root/sbin/devd/devd.cc
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2012-09-22 12:42:51 +0000
committerpjd <pjd@FreeBSD.org>2012-09-22 12:42:51 +0000
commit66da4b41b33657686a22e405117852035b6cc042 (patch)
tree420d99766190693e88f07e1e83dacb77093fe473 /sbin/devd/devd.cc
parent04357ca182e4148a5ac07d40907afc1172ebe854 (diff)
downloadFreeBSD-src-66da4b41b33657686a22e405117852035b6cc042.zip
FreeBSD-src-66da4b41b33657686a22e405117852035b6cc042.tar.gz
Use O_CLOEXEC for open instead of separate fcntl(2) call.
Diffstat (limited to 'sbin/devd/devd.cc')
-rw-r--r--sbin/devd/devd.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc
index 453d3df..7724719 100644
--- a/sbin/devd/devd.cc
+++ b/sbin/devd/devd.cc
@@ -855,11 +855,9 @@ event_loop(void)
timeval tv;
fd_set fds;
- fd = open(PATH_DEVCTL, O_RDONLY);
+ fd = open(PATH_DEVCTL, O_RDONLY | O_CLOEXEC);
if (fd == -1)
err(1, "Can't open devctl device %s", PATH_DEVCTL);
- if (fcntl(fd, F_SETFD, FD_CLOEXEC) != 0)
- err(1, "Can't set close-on-exec flag on devctl");
server_fd = create_socket(PIPE);
max_fd = max(fd, server_fd) + 1;
while (1) {
OpenPOWER on IntegriCloud