mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-17 09:10:22 +02:00
* dynl.c (scm_dynamic_call, scm_dynamic_args_call): Wrap dynamic
function call in SCM_DEFER_INTS/SCM_ALLOW_INTS. (scm_dynamic_link, scm_dynamic_unlink, scm_dynamic_func): Always call the sysdep functions with deferred ints. * dynl.c, dynl-dl.c, dynl-dld.c, dynl-shl.c (sysdep_dynl_link, sysdep_dynl_unlink, sysdep_dynl_func): Expect to be called with deferred interrupts and insert SCM_ALLOW_INTS before throwing an error. * dynl.c (scm_dynamic_unlink, scm_dynamic_call): Return SCM_UNSPECIFIED.
This commit is contained in:
parent
cc0b331281
commit
419e9e117f
4 changed files with 49 additions and 28 deletions
|
@ -60,7 +60,10 @@ sysdep_dynl_link (fname, subr)
|
|||
{
|
||||
void *handle = dlopen (fname, DLOPEN_MODE);
|
||||
if (NULL == handle)
|
||||
{
|
||||
SCM_ALLOW_INTS;
|
||||
scm_misc_error (subr, (char *)dlerror (), SCM_EOL);
|
||||
}
|
||||
return handle;
|
||||
}
|
||||
|
||||
|
@ -69,13 +72,11 @@ sysdep_dynl_unlink (handle, subr)
|
|||
void *handle;
|
||||
char *subr;
|
||||
{
|
||||
int status;
|
||||
|
||||
SCM_DEFER_INTS;
|
||||
status = dlclose (handle);
|
||||
SCM_ALLOW_INTS;
|
||||
if(status)
|
||||
if (dlclose (handle))
|
||||
{
|
||||
SCM_ALLOW_INTS;
|
||||
scm_misc_error (subr, (char *)dlerror (), SCM_EOL);
|
||||
}
|
||||
}
|
||||
|
||||
static void *
|
||||
|
@ -87,13 +88,13 @@ sysdep_dynl_func (symb, handle, subr)
|
|||
void *fptr;
|
||||
char *err;
|
||||
|
||||
SCM_DEFER_INTS;
|
||||
fptr = dlsym (handle, symb);
|
||||
err = (char *)dlerror ();
|
||||
SCM_ALLOW_INTS;
|
||||
|
||||
if (!fptr)
|
||||
{
|
||||
SCM_ALLOW_INTS;
|
||||
scm_misc_error (subr, err? err : "symbol has NULL address", SCM_EOL);
|
||||
}
|
||||
return fptr;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue