aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/powerd
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2016-05-10 11:18:53 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2016-05-10 11:18:53 +0000
commit79477f3ca1825595d69bbf729a320184bf86d2f8 (patch)
tree9df167ae2ff77eb27b600d05d74b68de58b83aad /usr.sbin/powerd
parent68dd67a27b933f40fd6b4a5f321079fc634deebb (diff)
downloadsrc-79477f3ca1825595d69bbf729a320184bf86d2f8.tar.gz
src-79477f3ca1825595d69bbf729a320184bf86d2f8.zip
Directly set the NONBLOCK flags when creating the socket
No functional changes
Notes
Notes: svn path=/head/; revision=299359
Diffstat (limited to 'usr.sbin/powerd')
-rw-r--r--usr.sbin/powerd/powerd.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/usr.sbin/powerd/powerd.c b/usr.sbin/powerd/powerd.c
index 367a31f41c58..78d977f32fe5 100644
--- a/usr.sbin/powerd/powerd.c
+++ b/usr.sbin/powerd/powerd.c
@@ -379,7 +379,7 @@ devd_init(void)
struct sockaddr_un devd_addr;
bzero(&devd_addr, sizeof(devd_addr));
- if ((devd_pipe = socket(PF_LOCAL, SOCK_STREAM, 0)) < 0) {
+ if ((devd_pipe = socket(PF_LOCAL, SOCK_STREAM|SOCK_NONBLOCK, 0)) < 0) {
if (vflag)
warn("%s(): socket()", __func__);
return (-1);
@@ -396,13 +396,6 @@ devd_init(void)
return (-1);
}
- if (fcntl(devd_pipe, F_SETFL, O_NONBLOCK) == -1) {
- if (vflag)
- warn("%s(): fcntl()", __func__);
- close(devd_pipe);
- return (-1);
- }
-
return (devd_pipe);
}