summaryrefslogtreecommitdiffstats
path: root/gl/cloexec.c
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@aei.ca>2010-04-08 01:11:46 (GMT)
committerThomas Guyot-Sionnest <dermoth@aei.ca>2010-04-13 01:26:35 (GMT)
commit74da141e618ef99959d509cb2e7be35a348a39db (patch)
tree88ebc38b381a1021fc2d74864a71e230ae591c3d /gl/cloexec.c
parentc63a4f726a0b6ad8cf6040f947754a81fd4683bb (diff)
downloadmonitoring-plugins-74da141e618ef99959d509cb2e7be35a348a39db.tar.gz
Sync with the latest Gnulib code (177f525)
Signed-off-by: Thomas Guyot-Sionnest <dermoth@aei.ca>
Diffstat (limited to 'gl/cloexec.c')
-rw-r--r--gl/cloexec.c49
1 files changed, 37 insertions, 12 deletions
diff --git a/gl/cloexec.c b/gl/cloexec.c
index ff8105b..2d12efe 100644
--- a/gl/cloexec.c
+++ b/gl/cloexec.c
@@ -1,6 +1,6 @@
1/* closexec.c - set or clear the close-on-exec descriptor flag 1/* closexec.c - set or clear the close-on-exec descriptor flag
2 2
3 Copyright (C) 1991, 2004, 2005, 2006 Free Software Foundation, Inc. 3 Copyright (C) 1991, 2004-2006, 2009-2010 Free Software Foundation, Inc.
4 4
5 This program is free software: you can redistribute it and/or modify 5 This program is free software: you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
@@ -21,21 +21,24 @@
21 21
22#include "cloexec.h" 22#include "cloexec.h"
23 23
24#include <unistd.h> 24#include <errno.h>
25#include <fcntl.h> 25#include <fcntl.h>
26 26#include <unistd.h>
27#ifndef FD_CLOEXEC
28# define FD_CLOEXEC 1
29#endif
30 27
31/* Set the `FD_CLOEXEC' flag of DESC if VALUE is true, 28/* Set the `FD_CLOEXEC' flag of DESC if VALUE is true,
32 or clear the flag if VALUE is false. 29 or clear the flag if VALUE is false.
33 Return 0 on success, or -1 on error with `errno' set. */ 30 Return 0 on success, or -1 on error with `errno' set.
31
32 Note that on MingW, this function does NOT protect DESC from being
33 inherited into spawned children. Instead, either use dup_cloexec
34 followed by closing the original DESC, or use interfaces such as
35 open or pipe2 that accept flags like O_CLOEXEC to create DESC
36 non-inheritable in the first place. */
34 37
35int 38int
36set_cloexec_flag (int desc, bool value) 39set_cloexec_flag (int desc, bool value)
37{ 40{
38#if defined F_GETFD && defined F_SETFD 41#ifdef F_SETFD
39 42
40 int flags = fcntl (desc, F_GETFD, 0); 43 int flags = fcntl (desc, F_GETFD, 0);
41 44
@@ -44,15 +47,37 @@ set_cloexec_flag (int desc, bool value)
44 int newflags = (value ? flags | FD_CLOEXEC : flags & ~FD_CLOEXEC); 47 int newflags = (value ? flags | FD_CLOEXEC : flags & ~FD_CLOEXEC);
45 48
46 if (flags == newflags 49 if (flags == newflags
47 || fcntl (desc, F_SETFD, newflags) != -1) 50 || fcntl (desc, F_SETFD, newflags) != -1)
48 return 0; 51 return 0;
49 } 52 }
50 53
51 return -1; 54 return -1;
52 55
53#else 56#else /* !F_SETFD */
57
58 /* Use dup2 to reject invalid file descriptors; the cloexec flag
59 will be unaffected. */
60 if (desc < 0)
61 {
62 errno = EBADF;
63 return -1;
64 }
65 if (dup2 (desc, desc) < 0)
66 /* errno is EBADF here. */
67 return -1;
54 68
69 /* There is nothing we can do on this kind of platform. Punt. */
55 return 0; 70 return 0;
71#endif /* !F_SETFD */
72}
73
56 74
57#endif 75/* Duplicates a file handle FD, while marking the copy to be closed
76 prior to exec or spawn. Returns -1 and sets errno if FD could not
77 be duplicated. */
78
79int
80dup_cloexec (int fd)
81{
82 return fcntl (fd, F_DUPFD_CLOEXEC, 0);
58} 83}