OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

__readlink_chk: Remove micro-optimization

Browse Source
This commit is contained in:
Florian Weimer 2018-08-21 11:24:12 +02:00
parent 88ffb39dc6
commit ef939d928a
3 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2018-08-21 Florian Weimer <fweimer@redhat.com>
* debug/readlink_chk.c (__readlink_chk): Always call __readlink.
* sysdeps/unix/sysv/linux/generic/readlink_chk.c: Remove file.
2018-08-20 Florian Weimer <fweimer@redhat.com>
* sysdeps/unix/sysv/linux/generic/readlink_chk.c: Remove

4
debug/readlink_chk.c
View File

@ -29,9 +29,5 @@ __readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
if (len > buflen)
__chk_fail ();
#ifdef HAVE_INLINED_SYSCALLS
return INLINE_SYSCALL (readlink, 3, path, buf, len);
#else
return __readlink (path, buf, len);
#endif
}

33
sysdeps/unix/sysv/linux/generic/readlink_chk.c
View File

@ -1,33 +0,0 @@
/* Copyright (C) 2011-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
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 <unistd.h>
#include <fcntl.h>
#include <sys/param.h>
# include <errno.h>
# include <sysdep.h>
ssize_t
__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
{
if (len > buflen)
__chk_fail ();
return INLINE_SYSCALL_CALL (readlinkat, AT_FDCWD, path, buf, len);
}