diff options
| -rw-r--r-- | lib/ChangeLog | 5 | ||||
| -rw-r--r-- | lib/network.c | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index ee024389..0627d206 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2005-02-16 Andrew J. Schorr <ajschorr@alumni.princeton.edu> + + * network.c: (set_nonblocking) Should check return code from + fcntl(F_GETFL). + 2005-02-15 Andrew J. Schorr <ajschorr@alumni.princeton.edu> * network.h: Declare new function set_nonblocking. Indicate that diff --git a/lib/network.c b/lib/network.c index 3b296720..3373983b 100644 --- a/lib/network.c +++ b/lib/network.c @@ -75,7 +75,17 @@ writen(int fd, const u_char *ptr, int nbytes) int set_nonblocking(int fd) { - if (fcntl(fd, F_SETFL, (fcntl(fd, F_GETFL) | O_NONBLOCK)) < 0) + int flags; + + /* According to the Single UNIX Spec, the return value for F_GETFL should + never be negative. */ + if ((flags = fcntl(fd, F_GETFL)) < 0) + { + zlog_warn("fcntl(F_GETFL) failed for fd %d: %s", + fd, safe_strerror(errno)); + return -1; + } + if (fcntl(fd, F_SETFL, (flags | O_NONBLOCK)) < 0) { zlog_warn("fcntl failed setting fd %d non-blocking: %s", fd, safe_strerror(errno)); |