projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix problem with getdate on mingw32 reported by Simon Josefsson
[gnulib.git]
/
lib
/
cloexec.c
diff --git
a/lib/cloexec.c
b/lib/cloexec.c
index
20f30db
..
ff8105b
100644
(file)
--- a/
lib/cloexec.c
+++ b/
lib/cloexec.c
@@
-1,10
+1,11
@@
/* closexec.c - set or clear the close-on-exec descriptor flag
/* closexec.c - set or clear the close-on-exec descriptor flag
- Copyright (C) 1991, 2004 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1991, 2004, 2005, 2006 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
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-12,24
+13,16
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
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.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
The code is taken from glibc/manual/llio.texi */
The code is taken from glibc/manual/llio.texi */
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "cloexec.h"
#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
#ifndef FD_CLOEXEC
# define FD_CLOEXEC 1
@@
-37,27
+30,29
@@
/* Set the `FD_CLOEXEC' flag of DESC if VALUE is true,
or clear the flag if VALUE is false.
/* 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);
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
#else
- return
true
;
+ return
0
;
#endif
}
#endif
}