diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | support/Makefile | 1 | ||||
| -rw-r--r-- | support/xdlfcn.h | 2 | ||||
| -rw-r--r-- | support/xdlmopen.c | 31 |
4 files changed, 39 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index c143073ca7..1c477228f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-02-07 Florian Weimer <fweimer@redhat.com> + + * support/xdlfcn.h (xdlmopen): Declare. + * support/xdlmopen.c: New file. + * support/Makefile (libsupport-routines): Add xdlmopen. + 2019-02-06 Joseph Myers <joseph@codesourcery.com> * elf/dl-load.h (_dl_postprocess_loadcmd): Use __always_inline diff --git a/support/Makefile b/support/Makefile index 9ff0ec3fff..f173565202 100644 --- a/support/Makefile +++ b/support/Makefile @@ -81,6 +81,7 @@ libsupport-routines = \ xconnect \ xcopy_file_range \ xdlfcn \ + xdlmopen \ xdup2 \ xfclose \ xfopen \ diff --git a/support/xdlfcn.h b/support/xdlfcn.h index 559281fc74..c9cd810a8a 100644 --- a/support/xdlfcn.h +++ b/support/xdlfcn.h @@ -25,10 +25,10 @@ __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 xdlclose (void *handle); - __END_DECLS #endif /* SUPPORT_DLOPEN_H */ diff --git a/support/xdlmopen.c b/support/xdlmopen.c new file mode 100644 index 0000000000..9a39ba8801 --- /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 + <http://www.gnu.org/licenses/>. */ + +#include <support/check.h> +#include <support/xdlfcn.h> + +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; +} |