* chars.c (scm_lowers, scm_uppers, scm_charnames, scm_charnums),

[bpt/guile.git] / libguile / dynl-dld.c

diff --git a/libguile/dynl-dld.c b/libguile/dynl-dld.c
index aba8b93..eef786f 100644 (file)
--- a/libguile/dynl-dld.c
+++ b/libguile/dynl-dld.c
@@ -1,6 +1,6 @@
 /* dynl-dld.c - dynamic linking with dld
  *
- * Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+ * Copyright (C) 1990-1997 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,8 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
  *
  * As a special exception, the Free Software Foundation gives permission
  * for additional uses of the text contained in its release of GUILE.
@@ -38,17 +39,12 @@
  *
  * If you write modifications of your own for GUILE, it is your choice
  * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  
- */
+ * If you do not wish that, delete this exception notice.  */
 
 /* "dynl.c" dynamically link&load object files.
    Author: Aubrey Jaffer
    Modified for libguile by Marius Vollmer */
 
-#include "_scm.h"
-#include "genio.h"
-#include "smob.h"
-
 #include "dld.h"
 
 static void listundef SCM_P ((void));
@@ -67,108 +63,58 @@ listundefs ()
     free(undefs);
 }
 
-SCM_PROC (s_dynamic_link, "dynamic-link", 1, 0, 0, scm_dynamic_link);
-
-SCM
-scm_dynamic_link (fname)
-     SCM fname;
+static void *
+sysdep_dynl_link (fname, subr)
+     const char *fname;
+     const char *subr;
 {
     int status;
-    
-    fname = scm_coerce_rostring (fname, s_dynamic_link, SCM_ARG1);
 
-    SCM_DEFER_INTS;
-    status = dld_link (SCM_CHARS (fname));
-    SCM_ALLOW_INTS;
+    status = dld_link (fname);
     if (status)
-       scm_misc_error (s_dynamic_link, dld_strerror (status), SCM_EOL);
+      {
+       SCM_ALLOW_INTS;
+       scm_misc_error (subr, dld_strerror (status), SCM_EOL);
+      }
     return fname;
 }
 
-static void *get_func SCM_P ((char *subr, char *fname));
+static void
+sysdep_dynl_unlink (handle, subr)
+     void *handle;
+     const char *subr;
+{
+    int status;
+
+    status = dld_unlink_by_file ((char *)fname, 1);
+    if (status)
+      {
+       SCM_ALLOW_INTS;
+       scm_misc_error (s_dynamic_unlink, dld_strerror (status), SCM_EOL);
+      }
+}
 
 static void *
-get_func (subr, fname)
-     char *subr;
-     char *fname;
+sysdep_dynl_func (symb, handle, subr)
+     const char *symb;
+     void *handle;
+     const char *subr;
 {
     void *func;
 
+    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);
     }
-    func = (void *) dld_get_func (func);
-    if (func == 0)
-       scm_misc_error (subr, dld_strerror (dld_errno), SCM_EOL);
     return func;
 }
 
-SCM_PROC (s_dynamic_call, "dynamic-call", 2, 0, 0, scm_dynamic_call);
-
-SCM
-scm_dynamic_call (symb, shl)
-     SCM symb;
-     SCM shl;
-{
-    void (*func)() = 0;
-
-    symb = scm_coerce_rostring (symb, s_dynamic_call, SCM_ARG1);
-
-    SCM_DEFER_INTS;
-    func = get_func (s_dynamic_call, SCM_CHARS (symb));
-    SCM_ALLOW_INST;
-    (*func) ();
-    return SCM_BOOL_T;
-}
-
-SCM_PROC (s_dynamic_args_call, "dynamic-args-call", 3, 0, 0, scm_dynamic_args_call);
-
-SCM
-scm_dynamic_args_call (symb, shl, args)
-     SCM symb, shl, args;
-{
-    int i, argc;
-    char **argv;
-    int (*func) SCM_P ((int argc, char **argv)) = 0;
-
-    symb = scm_coerce_rostring (symb, s_dynamic_args_call, SCM_ARG1);
-
-    SCM_DEFER_INTS;
-    func = get_func (SCM_CHARS (symb), s_dynamic_args_call);
-    argv = scm_make_argv_from_stringlist (args, &argc, s_dynamic_args_call,
-                                     SCM_ARG3);
-    SCM_ALLOW_INTS;
-
-    i = (*func) (argc, argv);
-
-    SCM_DEFER_INTS;
-    scm_must_free_argv(argv);
-    SCM_ALLOW_INTS;
-    return SCM_MAKINUM(0L+i);
-}
-
-SCM_PROC (s_dynamic_unlink, "dynamic-unlink", 1, 0, 0, scm_dynamic_unlink);
-
-SCM
-scm_dynamic_unlink(fname)
-     SCM fname;
-{
-    int status;
-
-    fname = scm_coerce_rostring (fname, s_dynamic_unlink, SCM_ARG1);
-
-    SCM_DEFER_INTS;
-    status = dld_unlink_by_file (SCM_CHARS (fname), 1);
-    SCM_ALLOW_INTS;
-
-    if (status)
-       scm_misc_error (s_dynamic_unlink, dld_strerror (status), SCM_EOL);
-    return SCM_BOOL_T;
-}
-
-void
-scm_init_dynamic_linking ()
+static void
+sysdep_dynl_init ()
 {
 #ifndef RTL
     if (!execpath)
@@ -179,8 +125,6 @@ scm_init_dynamic_linking ()
     }
 #endif
 
-#include "dynl.x"
-
 #ifdef DLD_DYNCM /* XXX - what's this? */
     add_feature("dld:dyncm");
 #endif