diff options
author | sf <sf@13f79535-47bb-0310-9956-ffa450edef68> | 2011-10-15 21:33:00 +0000 |
---|---|---|
committer | sf <sf@13f79535-47bb-0310-9956-ffa450edef68> | 2011-10-15 21:33:00 +0000 |
commit | 3c9621d2d809b76f28f2be08b4ce0c0740d86c93 (patch) | |
tree | 41f193acbb7349f7720ce9b6783312dbf7b2384d /file_io | |
parent | 5eb5d3cbbe46477b30ef313ecb9dda26e952667f (diff) | |
download | libapr-3c9621d2d809b76f28f2be08b4ce0c0740d86c93.tar.gz |
Backport r1183698:
Avoid fcntl() calls if support for O_CLOEXEC works.
PR: 48557
Submitted by: Mike Frysinger <vapier gentoo org>
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1183730 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io')
-rw-r--r-- | file_io/unix/open.c | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/file_io/unix/open.c b/file_io/unix/open.c index 3b7dc27c2..ea17f79d8 100644 --- a/file_io/unix/open.c +++ b/file_io/unix/open.c @@ -177,19 +177,29 @@ APR_DECLARE(apr_status_t) apr_file_open(apr_file_t **new, return errno; } if (!(flag & APR_FOPEN_NOCLEANUP)) { - int flags; - - if ((flags = fcntl(fd, F_GETFD)) == -1) { - close(fd); - return errno; - } +#ifdef O_CLOEXEC + static int has_o_cloexec = 0; + if (!has_o_cloexec) +#endif + { + int flags; - if ((flags & FD_CLOEXEC) == 0) { - flags |= FD_CLOEXEC; - if (fcntl(fd, F_SETFD, flags) == -1) { + if ((flags = fcntl(fd, F_GETFD)) == -1) { close(fd); return errno; } + if ((flags & FD_CLOEXEC) == 0) { + flags |= FD_CLOEXEC; + if (fcntl(fd, F_SETFD, flags) == -1) { + close(fd); + return errno; + } + } +#ifdef O_CLOEXEC + else { + has_o_cloexec = 1; + } +#endif } } |