diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-07-12 13:29:44 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-07-12 13:29:44 +0000 |
| commit | 13a4ee0bb4ccb6691729bde67233f5ca66209c7c (patch) | |
| tree | 72d62fed4d091a1f38c021d9c3eab5e50044e8c4 /sysdeps/unix/sysv/linux/open64.c | |
| parent | 0923a2c896f09795cca4a6d800a336a56b0ee42c (diff) | |
| download | glibc-13a4ee0bb4ccb6691729bde67233f5ca66209c7c.tar glibc-13a4ee0bb4ccb6691729bde67233f5ca66209c7c.tar.gz glibc-13a4ee0bb4ccb6691729bde67233f5ca66209c7c.tar.bz2 glibc-13a4ee0bb4ccb6691729bde67233f5ca66209c7c.zip | |
[BZ #4745]
[BZ #4586]
[BZ #4702]
[BZ #4525]
[BZ #4514]
[BZ #4512]
Merge selected bugfixes from the trunk.
Diffstat (limited to 'sysdeps/unix/sysv/linux/open64.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/open64.c | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/sysdeps/unix/sysv/linux/open64.c b/sysdeps/unix/sysv/linux/open64.c index c52ce39db1..5fb5363e1e 100644 --- a/sysdeps/unix/sysv/linux/open64.c +++ b/sysdeps/unix/sysv/linux/open64.c @@ -1,5 +1,4 @@ -/* Copyright (C) 1991,1995-1997,1999,2000,2002,2007 - Free Software Foundation, Inc. +/* Copyright (C) 1991,1995-1997,1999,2000,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -20,7 +19,7 @@ #include <errno.h> #include <fcntl.h> #include <stdarg.h> -#include <stdio.h> +#include <bp-sym.h> #include <sysdep-cancel.h> /* Open FILE with access OFLAG. If OFLAG includes O_CREAT, @@ -49,29 +48,6 @@ __libc_open64 (const char *file, int oflag, ...) return result; } -weak_alias (__libc_open64, __open64) -libc_hidden_weak (__open64) -weak_alias (__libc_open64, open64) - - -#ifndef PTW -int -__open64_2 (file, oflag) - const char *file; - int oflag; -{ - if (oflag & O_CREAT) - __fortify_fail ("invalid open64 call: O_CREAT without mode"); - - if (SINGLE_THREAD_P) - return INLINE_SYSCALL (open, 2, file, oflag | O_LARGEFILE); - - int oldtype = LIBC_CANCEL_ASYNC (); - - int result = INLINE_SYSCALL (open, 2, file, oflag | O_LARGEFILE); - - LIBC_CANCEL_RESET (oldtype); - - return result; -} -#endif +weak_alias (__libc_open64, BP_SYM (__open64)) +libc_hidden_weak (BP_SYM (__open64)) +weak_alias (__libc_open64, BP_SYM (open64)) |