diff options
Diffstat (limited to 'lib/cloexec.c')
| -rw-r--r-- | lib/cloexec.c | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/lib/cloexec.c b/lib/cloexec.c index 20f30db4..cf2308ca 100644 --- a/lib/cloexec.c +++ b/lib/cloexec.c @@ -1,5 +1,5 @@ /* closexec.c - set or clear the close-on-exec descriptor flag - Copyright (C) 1991, 2004 Free Software Foundation, Inc. + Copyright (C) 1991, 2004, 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,23 +13,18 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. The code is taken from glibc/manual/llio.texi */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include <config.h> #endif #include "cloexec.h" -#if HAVE_UNISTD_H -# include <unistd.h> -#endif - -#if HAVE_FCNTL_H -# include <fcntl.h> -#endif +#include <unistd.h> +#include <fcntl.h> #ifndef FD_CLOEXEC # define FD_CLOEXEC 1 @@ -37,27 +32,29 @@ /* Set the `FD_CLOEXEC' flag of DESC if VALUE is true, or clear the flag if VALUE is false. - Return true on success, or false on error with `errno' set. */ + Return 0 on success, or -1 on error with `errno' set. */ -bool +int set_cloexec_flag (int desc, bool value) { #if defined F_GETFD && defined F_SETFD int flags = fcntl (desc, F_GETFD, 0); - int newflags; - if (flags < 0) - return false; + if (0 <= flags) + { + int newflags = (value ? flags | FD_CLOEXEC : flags & ~FD_CLOEXEC); - newflags = (value ? flags | FD_CLOEXEC : flags & ~FD_CLOEXEC); + if (flags == newflags + || fcntl (desc, F_SETFD, newflags) != -1) + return 0; + } - return (flags == newflags - || fcntl (desc, F_SETFD, newflags) != -1); + return -1; #else - return true; + return 0; #endif } |