From 645bcdec2a936ecbd5cd8fa399aee3696e8ef7c3 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 9 Dec 2009 11:21:35 +0100 Subject: [PATCH] cloexec: Clarify code. --- ChangeLog | 4 ++++ lib/cloexec.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8597a13e9..871ac1ea8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-12-09 Bruno Haible + + * lib/cloexec.c (set_cloexec_flag): Clarify intent of dup2 call. + 2009-12-08 Eric Blake fchdir: avoid memory leak on re-registration. diff --git a/lib/cloexec.c b/lib/cloexec.c index 18985cb23..69b45b4a3 100644 --- a/lib/cloexec.c +++ b/lib/cloexec.c @@ -71,8 +71,12 @@ set_cloexec_flag (int desc, bool value) errno = EBADF; return -1; } - return dup2 (desc, desc) == desc ? 0 : -1; + if (dup2 (desc, desc) < 0) + /* errno is EBADF here. */ + return -1; + /* There is nothing we can do on this kind of platform. Punt. */ + return 0; #endif } -- 2.11.0