2013-05-03 Roland McGrath <roland@hack.frob.com>
+ * io/open.c (__open_2): Moved to ...
+ * io/open_2.c: ... this new file.
+ * io/open64.c (__open64_2): Moved to ...
+ * io/open64_2.c: ... this new file.
+ * io/openat.c (__openat_2): Moved to ...
+ * io/openat_2.c: ... this new file.
+ * io/openat64.c (__openat64_2): Moved to ...
+ * io/openat64_2.c: ... this new file.
+ * io/Makefile (routines): Add them.
+ * sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Remove them.
+ * sysdeps/unix/sysv/linux/open_2.c: File removed.
+ * sysdeps/unix/sysv/linux/open64_2.c: File removed.
+ * sysdeps/unix/sysv/linux/openat.c (__OPENAT_2): Removed.
+ * sysdeps/unix/sysv/linux/openat64.c (__OPENAT_2): Removed.
+ * sysdeps/unix/sysv/linux/wordsize-64/openat.c (__openat_2): Removed.
+ (__openat64): Add hidden_ver.
+ * sysdeps/mach/hurd/open.c (__open_2, __open64_2): Removed.
+ * sysdeps/mach/hurd/openat.c (__openat_2): Removed.
+
* elf/dl-sysdep.c (_dl_sysdep_start) [NEED_DL_SYSINFO]:
Separately conditionalize setting of GLRO(dl_sysinfo) so
that the GLRO(dl_sysinfo_dso) test is under [NEED_DL_SYSINFO_DSO]
statvfs fstatvfs statvfs64 fstatvfs64 \
umask chmod fchmod lchmod fchmodat \
mkdir mkdirat \
- open open64 openat openat64 close \
+ open open_2 open64 open64_2 openat openat_2 openat64 openat64_2 \
read write lseek lseek64 access euidaccess faccessat \
fcntl flock lockf lockf64 \
- dup dup2 dup3 pipe pipe2 \
+ close dup dup2 dup3 pipe pipe2 \
creat creat64 \
chdir fchdir \
getcwd getwd getdirname \
#include <stddef.h>
#include <stdio.h>
-extern char **__libc_argv attribute_hidden;
/* Open FILE with access OFLAG. If OFLAG includes O_CREAT,
a third argument is the file protection. */
stub_warning (open)
-
-int
-__open_2 (file, oflag)
- const char *file;
- int oflag;
-{
- if (oflag & O_CREAT)
- __fortify_fail ("invalid open call: O_CREAT without mode");
-
- return __open (file, oflag);
-}
+/* __open_2 is a generic wrapper that calls __open.
+ So give a stub warning for that symbol too. */
stub_warning (__open_2)
stub_warning (open64)
-
-int
-__open64_2 (file, oflag)
- const char *file;
- int oflag;
-{
- if (oflag & O_CREAT)
- __fortify_fail ("invalid open64 call: O_CREAT without mode");
-
- return __open64 (file, oflag);
-}
+/* __open64_2 is a generic wrapper that calls __open64.
+ So give a stub warning for that symbol too. */
stub_warning (__open64_2)
-/* Copyright (C) 2007-2013 Free Software Foundation, Inc.
+/* _FORTIFY_SOURCE wrapper for open64.
+ Copyright (C) 2013 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
#include <fcntl.h>
#include <stdio.h>
-
int
-__open64_2 (file, oflag)
- const char *file;
- int oflag;
+__open64_2 (const char *file, int oflag)
{
if (oflag & O_CREAT)
__fortify_fail ("invalid open64 call: O_CREAT without mode");
-/* Copyright (C) 2007-2013 Free Software Foundation, Inc.
+/* _FORTIFY_SOURCE wrapper for open.
+ Copyright (C) 2013 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
#include <fcntl.h>
#include <stdio.h>
-
int
-__open_2 (file, oflag)
- const char *file;
- int oflag;
+__open_2 (const char *file, int oflag)
{
if (oflag & O_CREAT)
__fortify_fail ("invalid open call: O_CREAT without mode");
weak_alias (__openat, openat)
stub_warning (openat)
-
-int
-__openat_2 (fd, file, oflag)
- int fd;
- const char *file;
- int oflag;
-{
- if (oflag & O_CREAT)
- __fortify_fail ("invalid openat call: O_CREAT without mode");
-
- return __openat (fd, file, oflag);
-}
+/* __openat_2 is a generic wrapper that calls __openat.
+ So give a stub warning for that symbol too. */
stub_warning (__openat_2)
weak_alias (__openat64, openat64)
stub_warning (openat64)
-
-int
-__openat64_2 (fd, file, oflag)
- int fd;
- const char *file;
- int oflag;
-{
- if (oflag & O_CREAT)
- __fortify_fail ("invalid openat64 call: O_CREAT without mode");
-
- return __openat64 (fd, file, oflag);
-}
+/* __openat64_2 is a generic wrapper that calls __openat64.
+ So give a stub warning for that symbol too. */
stub_warning (__openat_2)
--- /dev/null
+/* _FORTIFY_SOURCE wrapper for openat64.
+ Copyright (C) 2013 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <fcntl.h>
+#include <stdio.h>
+
+int
+__openat64_2 (int fd, const char *file, int oflag)
+{
+ if (oflag & O_CREAT)
+ __fortify_fail ("invalid openat64 call: O_CREAT without mode");
+
+ return __openat64 (fd, file, oflag);
+}
--- /dev/null
+/* _FORTIFY_SOURCE wrapper for openat.
+ Copyright (C) 2013 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <fcntl.h>
+#include <stdio.h>
+
+int
+__openat_2 (int fd, const char *file, int oflag)
+{
+ if (oflag & O_CREAT)
+ __fortify_fail ("invalid openat call: O_CREAT without mode");
+
+ return __openat (fd, file, oflag);
+}
libc_hidden_weak (__open)
weak_alias (__libc_open, open)
-int
-__open_2 (file, oflag)
- const char *file;
- int oflag;
-{
- if (oflag & O_CREAT)
- __fortify_fail ("invalid open call: O_CREAT without mode");
-
- return __open (file, oflag);
-}
/* open64 is just the same as open for us. */
weak_alias (__libc_open, __libc_open64)
weak_alias (__libc_open, __open64)
libc_hidden_weak (_open64)
weak_alias (__libc_open, open64)
-strong_alias (__open_2, __open64_2)
libc_hidden_def (__openat)
weak_alias (__openat, openat)
-int
-__openat_2 (fd, file, oflag)
- int fd;
- const char *file;
- int oflag;
-{
- if (oflag & O_CREAT)
- __fortify_fail ("invalid openat call: O_CREAT without mode");
-
- return __openat (fd, file, oflag);
-}
-
/* openat64 is just the same as openat for us. */
weak_alias (__openat, __openat64)
libc_hidden_weak (__openat64)
weak_alias (__openat, openat64)
-strong_alias (__openat_2, __openat64_2)
ifeq ($(subdir),io)
sysdep_routines += xstatconv internal_statvfs internal_statvfs64 \
- sync_file_range open_2 open64_2 fallocate fallocate64
+ sync_file_range fallocate fallocate64
sysdep_headers += bits/fcntl-linux.h
endif
#ifndef OPENAT
# define OPENAT openat
-# define __OPENAT_2 __openat_2
# ifndef __ASSUME_ATFCTS
/* Set errno after a failed call. If BUF is not null,
}
libc_hidden_def (__OPENAT)
weak_alias (__OPENAT, OPENAT)
-
-
-int
-__OPENAT_2 (fd, file, oflag)
- int fd;
- const char *file;
- int oflag;
-{
- if (oflag & O_CREAT)
-#define MSG(s) MSG2 (s)
-#define MSG2(s) "invalid " #s " call: O_CREAT without mode"
- __fortify_fail (MSG (OPENAT));
-
- return __OPENAT (fd, file, oflag);
-}
#define OPENAT openat64
-#define __OPENAT_2 __openat64_2
#define MORE_OFLAGS O_LARGEFILE
#include "openat.c"
#define __openat64 __rename___openat64
-#define __openat64_2 __rename___openat64_2
#define __openat64_nocancel __rename___openat64_nocancel
#define openat64 __rename_openat64
#include "../openat.c"
#undef __openat64
-#undef __openat64_2
#undef __openat64_nocancel
#undef openat64
-weak_alias (__openat, __openat64)
-weak_alias (__openat_2, __openat64_2)
-weak_alias (__openat_nocancel, __openat64_nocancel)
+strong_alias (__openat, __openat64)
+hidden_ver (__openat, __openat64)
+strong_alias (__openat_nocancel, __openat64_nocancel)
weak_alias (openat, openat64)
git.samba.org / jlayton / glibc.git / commitdiff