lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-12-24 17:51:17 +03:00
Code Activity

linux: Consolidate dl-origin.c

Browse Source 
Use the generic implementation as the default, since the syscall
is supported by all architectures.

Also cleanup some headers and remove the INTERNAL_SYSCALL_ERROR_P
usage (the INTERNAL_SYSCALL_CALL macro already returns an negative
value if an error occurs).
This commit is contained in:
Adhemerval Zanella Netto
2022-10-19 19:14:05 -03:00
committed by Adhemerval Zanella
parent 36d423e203
commit b14e1f9fcd
2 changed files with 5 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sysdeps/unix/sysv/linux/dl-origin.c
View File

@@ -17,15 +17,11 @@
<https://www.gnu.org/licenses/>. */
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/param.h>
#include <dl-dst.h>
#include <fcntl.h>
#include <ldsodefs.h>
#include <sysdep.h>
#include <dl-dst.h>
/* On Linux >= 2.1 systems which have the dcache implementation we can get
the path of the application from the /proc/self/exe symlink. Try this
first and fall back on the generic method if necessary. */
@@ -37,9 +33,9 @@ _dl_get_origin (void)
char *result;
int len;
len = INTERNAL_SYSCALL_CALL (readlink, "/proc/self/exe", linkval,
sizeof (linkval));
if (! INTERNAL_SYSCALL_ERROR_P (len) && len > 0 && linkval[0] != '[')
len = INTERNAL_SYSCALL_CALL (readlinkat, AT_FDCWD, "/proc/self/exe",
linkval, sizeof (linkval));
if (len > 0 && linkval[0] != '[')
{
/* We can use this value. */
assert (linkval[0] == '/');