summaryrefslogtreecommitdiff
path: root/libguile/dynl-dld.c
diff options
context:
space:
mode:
authorMarius Vollmer <mvo@zagadka.de>1997-06-16 19:09:11 +0000
committerMarius Vollmer <mvo@zagadka.de>1997-06-16 19:09:11 +0000
commit419e9e117fa110de24b87ace73984f133887078c (patch)
treef70d0d329433545effbc249fe2e4f98a7f6a79c6 /libguile/dynl-dld.c
parentcc0b33128194d56e08b3deabe3916b8753a30f9f (diff)
downloadguile-419e9e117fa110de24b87ace73984f133887078c.tar.gz
* 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.
Diffstat (limited to 'libguile/dynl-dld.c')
-rw-r--r--libguile/dynl-dld.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/libguile/dynl-dld.c b/libguile/dynl-dld.c
index f9cec2778..17d975c83 100644
--- a/libguile/dynl-dld.c
+++ b/libguile/dynl-dld.c
@@ -72,7 +72,10 @@ sysdep_dynl_link (fname, subr)
status = dld_link (fname);
if (status)
+ {
+ SCM_ALLOW_INTS;
scm_misc_error (subr, dld_strerror (status), SCM_EOL);
+ }
return fname;
}
@@ -83,11 +86,12 @@ sysdep_dynl_unlink (handle, subr)
{
int status;
- SCM_DEFER_INTS;
status = dld_unlink_by_file ((char *)fname, 1);
- SCM_ALLOW_INTS;
if (status)
+ {
+ SCM_ALLOW_INTS;
scm_misc_error (s_dynamic_unlink, dld_strerror (status), SCM_EOL);
+ }
}
static void *
@@ -98,15 +102,14 @@ sysdep_dynl_func (symb, handle, subr)
{
void *func;
- SCM_DEFER_INTS;
func = (void *) dld_get_func (func);
if (func == 0)
scm_misc_error (subr, dld_strerror (dld_errno), SCM_EOL);
if (!dld_function_executable_p (func)) {
listundefs ();
+ SCM_ALLOW_INTS;
scm_misc_error (subr, "unresolved symbols remain", SCM_EOL);
}
- SCM_ALLOW_INTS;
return func;
}