From patchwork Wed Feb 6 17:12:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 31333 Received: (qmail 61821 invoked by alias); 6 Feb 2019 17:12:13 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 61809 invoked by uid 89); 6 Feb 2019 17:12:13 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=gabriel, Gabriel, complained X-HELO: mx1.redhat.com From: Florian Weimer To: "Gabriel F. T. Gomes" Cc: Subject: Re: [PATCH] support: Implement xdlmopen References: <87y36vx42o.fsf@oldenburg2.str.redhat.com> <20190205173623.GA8924@tereshkova.br.ibm.com> Date: Wed, 06 Feb 2019 18:12:08 +0100 In-Reply-To: <20190205173623.GA8924@tereshkova.br.ibm.com> (Gabriel F. T. Gomes's message of "Tue, 5 Feb 2019 15:36:23 -0200") Message-ID: <87a7j84z9z.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 * 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 * 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 + . */ + +#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; +}