aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-12-19 02:59:06 +0000
committerUlrich Drepper <drepper@redhat.com>1999-12-19 02:59:06 +0000
commit43f94f913e1078818bd09d426756ba4377f12517 (patch)
tree397455b5b1a78ea94bbd2851290bdf52f7f8a46b
parentc2ed387790257a11706e67c36755d796c5d37f76 (diff)
downloadglibc-43f94f913e1078818bd09d426756ba4377f12517.tar
glibc-43f94f913e1078818bd09d426756ba4377f12517.tar.gz
glibc-43f94f913e1078818bd09d426756ba4377f12517.tar.bz2
glibc-43f94f913e1078818bd09d426756ba4377f12517.zip
Update.
1999-12-11 H.J. Lu <hjl@gnu.org> * sysdeps/generic/libc-start.c (check_one_fd): Use __libc_fcntl instead of __fcntl.
-rw-r--r--ChangeLog5
-rw-r--r--iconvdata/gconv-modules4
-rw-r--r--sysdeps/generic/libc-start.c3
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d5958d9c3..c5f08aaa19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-12-11 H.J. Lu <hjl@gnu.org>
+
+ * sysdeps/generic/libc-start.c (check_one_fd): Use __libc_fcntl
+ instead of __fcntl.
+
1999-12-18 Ulrich Drepper <drepper@cygnus.com>
* iconvdata/isiri-3342.c: New file.
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index fd571ee37a..9228ff62fa 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1150,3 +1150,7 @@ module INTERNAL TIS-620// TIS-620 1
# from to module cost
module KOI8-U// INTERNAL KOI8-U 1
module INTERNAL KOI8-U// KOI8-U 1
+
+# from to module cost
+module ISIRI-3342// INTERNAL ISIRI-3342 1
+module INTERNAL ISIRI-3342// ISIRI-3342 1
diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c
index 191a1e017f..58e7804f26 100644
--- a/sysdeps/generic/libc-start.c
+++ b/sysdeps/generic/libc-start.c
@@ -25,6 +25,7 @@
#include <elf/ldsodefs.h>
extern void __libc_init_first (int argc, char **argv, char **envp);
+extern int __libc_fcntl (int fd, int cmd, ...);
extern int _dl_starting_up;
weak_extern (_dl_starting_up)
@@ -96,7 +97,7 @@ __libc_start_main (int (*main) (int, char **, char **), int argc,
static void
check_one_fd (int fd, int mode)
{
- if (__fcntl (fd, F_GETFD) == -1 && errno == EBADF)
+ if (__libc_fcntl (fd, F_GETFD) == -1 && errno == EBADF)
{
/* Something is wrong with this descriptor, it's probably not
opened. Open /dev/null so that the SUID program we are