From abb3587fe939d469a44f2097bae361aabd269f3f Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sat, 5 Sep 2009 22:04:36 +0200 Subject: CLOEXEC: use open(CLOEXEC) if exist; do not check fcntl(FD_CLOEXEC) failure text data bss dec hex filename - 370 0 0 370 172 libc/misc/dirent/opendir.o + 366 0 0 366 16e libc/misc/dirent/opendir.o - 375 4 0 379 17b libc/pwd_grp/lckpwdf.o + 356 4 0 360 168 libc/pwd_grp/lckpwdf.o - 248 0 0 248 f8 librt/shm.o + 209 0 0 209 d1 librt/shm.o Signed-off-by: Denys Vlasenko --- libc/misc/utmp/utent.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'libc/misc/utmp') diff --git a/libc/misc/utmp/utent.c b/libc/misc/utmp/utent.c index f0700af21..7d8a2d3c1 100644 --- a/libc/misc/utmp/utent.c +++ b/libc/misc/utmp/utent.c @@ -34,24 +34,29 @@ static const char *static_ut_name = default_file_name; static void __setutent(void) { if (static_fd < 0) { - static_fd = open(static_ut_name, O_RDWR); +#ifndef O_CLOEXEC +# define O_CLOEXEC 0 +#endif + static_fd = open(static_ut_name, O_RDWR | O_CLOEXEC); if (static_fd < 0) { - static_fd = open(static_ut_name, O_RDONLY); + static_fd = open(static_ut_name, O_RDONLY | O_CLOEXEC); if (static_fd < 0) { return; /* static_fd remains < 0 */ } } - /* Make sure the file will be closed on exec() */ - fcntl(static_fd, F_SETFD, FD_CLOEXEC); - // thus far, {G,S}ETFD only has this single flag, - // and setting it never fails. - //int ret = fcntl(static_fd, F_GETFD, 0); - //if (ret >= 0) { - // ret = fcntl(static_fd, F_SETFD, ret | FD_CLOEXEC); - //} - //if (ret < 0) { - // static_fd = -1; - //} + if (O_CLOEXEC == 0) { + /* Make sure the file will be closed on exec() */ + fcntl(static_fd, F_SETFD, FD_CLOEXEC); + // thus far, {G,S}ETFD only has this single flag, + // and setting it never fails. + //int ret = fcntl(static_fd, F_GETFD, 0); + //if (ret >= 0) { + // ret = fcntl(static_fd, F_SETFD, ret | FD_CLOEXEC); + //} + //if (ret < 0) { + // static_fd = -1; + //} + } return; } lseek(static_fd, 0, SEEK_SET); -- cgit v1.2.3