If open(O_CLOEXEC) fails, fall back to fcntl(CLOEXEC)

This is needed for folks who build with recent Linux kernel headers
but run with older kernels.
This commit is contained in:
Nick Mathewson 2012-02-14 11:48:55 -05:00
parent f088d0c52e
commit 2ed4430225

View File

@ -102,9 +102,14 @@ evutil_open_closeonexec(const char *pathname, int flags, unsigned mode)
int fd; int fd;
#ifdef O_CLOEXEC #ifdef O_CLOEXEC
flags |= O_CLOEXEC; if (flags & O_CREAT)
fd = open(pathname, flags|O_CLOEXEC, (mode_t)mode);
else
fd = open(pathname, flags|O_CLOEXEC);
if (fd >= 0 || errno == EINVAL)
return fd;
/* If we got an EINVAL, fall through and try without O_CLOEXEC */
#endif #endif
if (flags & O_CREAT) if (flags & O_CREAT)
fd = open(pathname, flags, (mode_t)mode); fd = open(pathname, flags, (mode_t)mode);
else else
@ -112,7 +117,7 @@ evutil_open_closeonexec(const char *pathname, int flags, unsigned mode)
if (fd < 0) if (fd < 0)
return -1; return -1;
#if !defined(O_CLOEXEC) && defined(FD_CLOEXEC) #if defined(FD_CLOEXEC)
if (fcntl(fd, F_SETFD, FD_CLOEXEC) < 0) if (fcntl(fd, F_SETFD, FD_CLOEXEC) < 0)
return -1; return -1;
#endif #endif