From bc09020455d9847e966183d8a0ec2ef07bbaafab Mon Sep 17 00:00:00 2001 From: Packit Service Date: Apr 16 2021 22:38:35 +0000 Subject: Apply patch glibc-rh1817513-78.patch patch_name: glibc-rh1817513-78.patch present_in_specfile: true location_in_specfile: 479 --- diff --git a/support/Makefile b/support/Makefile index 5808a42..895b83a 100644 --- a/support/Makefile +++ b/support/Makefile @@ -86,6 +86,7 @@ libsupport-routines = \ xconnect \ xcopy_file_range \ xdlfcn \ + xdlmopen \ xdup2 \ xfclose \ xfopen \ diff --git a/support/xdlfcn.h b/support/xdlfcn.h index ab1cbb3..a53fb61 100644 --- a/support/xdlfcn.h +++ b/support/xdlfcn.h @@ -25,11 +25,11 @@ __BEGIN_DECLS /* Each of these terminates process on failure with relevant error message. */ void *xdlopen (const char *filename, int flags); +void *xdlmopen (Lmid_t lmid, const char *filename, int flags); void *xdlsym (void *handle, const char *symbol); void *xdlvsym (void *handle, const char *symbol, const char *version); void xdlclose (void *handle); - __END_DECLS #endif /* SUPPORT_DLOPEN_H */ diff --git a/support/xdlmopen.c b/support/xdlmopen.c new file mode 100644 index 0000000..9a39ba8 --- /dev/null +++ b/support/xdlmopen.c @@ -0,0 +1,31 @@ +/* dlmopen with error checking. + Copyright (C) 2017-2019 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 + +void * +xdlmopen (Lmid_t lmid, const char *filename, int flags) +{ + void *dso = dlmopen (lmid, filename, flags); + + if (dso == NULL) + FAIL_EXIT1 ("error: dlmopen: %s\n", dlerror ()); + + return dso; +}