diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/utmp_file.c | 13 | ||||
| -rw-r--r-- | sysdeps/unix/bsd/getpt.c | 14 |
2 files changed, 16 insertions, 11 deletions
diff --git a/sysdeps/generic/utmp_file.c b/sysdeps/generic/utmp_file.c index ddf4946..74e91fb 100644 --- a/sysdeps/generic/utmp_file.c +++ b/sysdeps/generic/utmp_file.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com> and Paul Janzen <pcj@primenet.com>, 1996. @@ -114,6 +114,7 @@ setutent_file (void) if (file_fd < 0) { const char *file_name; + int result; file_name = TRANSFORM_UTMP_FILE_NAME (__libc_utmp_file_name); @@ -125,6 +126,16 @@ setutent_file (void) if (file_fd == -1) return 0; } + + /* We have to make sure the file is `closed on exec'. */ + result = __fcntl (file_fd, F_GETFD, 0); + if (result >= 0) + result = __fcntl (file_fd, F_SETFD, result | FD_CLOEXEC); + if (result == -1) + { + close (file_fd); + return 0; + } } __lseek (file_fd, 0, SEEK_SET); diff --git a/sysdeps/unix/bsd/getpt.c b/sysdeps/unix/bsd/getpt.c index 55d87fa..d807097 100644 --- a/sysdeps/unix/bsd/getpt.c +++ b/sysdeps/unix/bsd/getpt.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998. @@ -64,20 +64,14 @@ __getpt (void) fd = __open (buf, O_RDWR); if (fd != -1) - { - if (__isatty (fd)) - return fd; + return fd; - __close (fd); - continue; - } - - if (errno != EIO) + if (errno == ENOENT) return -1; } } - __set_errno (ENFILE); + __set_errno (ENOENT); return -1; } weak_alias (__getpt, getpt) |