Message ID | 87y36vx42o.fsf@oldenburg2.str.redhat.com |
---|---|
State | New |
Headers | show |
Series | support: Implement xdlmopen | expand |
On Mon, Feb 04 2019, Florian Weimer wrote: > > * support/xdlfcn.h (xdlmopen): Declare. > * support/xdlmopen.c: New file. Missing an entry for the change in support/Makefile. > + /* Clear any errors. */ > + dlerror (); Why is this needed? If the call to dlmopen failed, dlerror is called from within the preceding FAIL_EXIT1 statement. I didn't understand what other errors should be cleared here. > + return dso; > +} > + Probably not important, but `git am' complained about a "new blank line at EOF". I suppose it's something wrong with my git configuration. :(
* Gabriel F. T. Gomes: > On Mon, Feb 04 2019, Florian Weimer wrote: >> >> * support/xdlfcn.h (xdlmopen): Declare. >> * support/xdlmopen.c: New file. > > Missing an entry for the change in support/Makefile. Thanks, fixed. >> + /* Clear any errors. */ >> + dlerror (); > > Why is this needed? If the call to dlmopen failed, dlerror is called > from within the preceding FAIL_EXIT1 statement. I didn't understand > what other errors should be cleared here. This came from xdlopen. I fixed it with Paul's help in commit 3b935595859e0232b74594c5aca6da88a31f90b3. The new version no longer has it. >> + return dso; >> +} >> + > > Probably not important, but `git am' complained about a "new blank line > at EOF". I suppose it's something wrong with my git configuration. :( That's a tooling bug on my end, it should detect spurious newlines at the end of files, but currently does not. I have removed it. Updated patch below. Thanks, Florian support: Implement xdlmopen Put xdlmopen into its own file, to avoid disturbing static linking tests (where dlmopen pulls in additional code). 2019-02-03 Florian Weimer <fweimer@redhat.com> * support/xdlfcn.h (xdlmopen): Declare. * support/xdlmopen.c: New file. * support/Makefile (libsupport-routines): Add xdlmopen. 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; +}
On Wed, Feb 06 2019, Florian Weimer wrote: > > Updated patch below. > > * support/xdlfcn.h (xdlmopen): Declare. > * support/xdlmopen.c: New file. > * support/Makefile (libsupport-routines): Add xdlmopen. This version looks good to me. Thanks.
diff --git a/support/Makefile b/support/Makefile index c15b93647c..180366e5a2 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..d4efe110f6 --- /dev/null +++ b/support/xdlmopen.c @@ -0,0 +1,35 @@ +/* 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 ()); + + /* Clear any errors. */ + dlerror (); + + return dso; +} +