From 2fc81f6ca56f1df5323fc849f3f8dc40f38fc5b2 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Netto Date: Wed, 19 Oct 2022 19:14:14 -0300 Subject: Linux: consolidate readlink implementation Use readlink syscall if defined, otherwise readlinkat. Checked on x86_64-linux-gnu. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/generic/readlink.c | 30 ------------------------- sysdeps/unix/sysv/linux/readlink.c | 35 ++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 30 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/generic/readlink.c create mode 100644 sysdeps/unix/sysv/linux/readlink.c (limited to 'sysdeps/unix/sysv/linux') diff --git a/sysdeps/unix/sysv/linux/generic/readlink.c b/sysdeps/unix/sysv/linux/generic/readlink.c deleted file mode 100644 index 9f25811a35..0000000000 --- a/sysdeps/unix/sysv/linux/generic/readlink.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (C) 2011-2022 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 - . */ - -#include -#include -#include - -/* Read the contents of the symbolic link PATH into no more than - LEN bytes of BUF. The contents are not null-terminated. - Returns the number of characters read, or -1 for errors. */ -ssize_t -__readlink (const char *path, char *buf, size_t len) -{ - return INLINE_SYSCALL (readlinkat, 4, AT_FDCWD, path, buf, len); -} -weak_alias (__readlink, readlink) diff --git a/sysdeps/unix/sysv/linux/readlink.c b/sysdeps/unix/sysv/linux/readlink.c new file mode 100644 index 0000000000..083dcaf502 --- /dev/null +++ b/sysdeps/unix/sysv/linux/readlink.c @@ -0,0 +1,35 @@ +/* Read value of a symbolic link. Linux version. + Copyright (C) 2011-2022 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 + . */ + +#include +#include +#include + +/* Read the contents of the symbolic link PATH into no more than + LEN bytes of BUF. The contents are not null-terminated. + Returns the number of characters read, or -1 for errors. */ +ssize_t +__readlink (const char *path, char *buf, size_t len) +{ +#ifdef __NR_readlink + return INLINE_SYSCALL_CALL (readlink, path, buf, len); +#else + return INLINE_SYSCALL_CALL (readlinkat, AT_FDCWD, path, buf, len); +#endif +} +weak_alias (__readlink, readlink) -- cgit 1.4.1