minor changes to internal interface.

Mon Aug 10 03:35:57 1998  Tim Janik  <timj@gtk.org>

        * gmodule.c: minor changes to internal interface.
        * gmodule-dl.c:
        * gmodule-dld.c: put some comments into the files, and provided
        better error checking for shl_findsym(). whish i had a system to
        test this stuff on.

gmodule/ChangeLog

@@ -1,3 +1,11 @@
+Mon Aug 10 03:35:57 1998  Tim Janik  <timj@gtk.org>
+
+	* gmodule.c: minor changes to internal interface.
+	* gmodule-dl.c: 
+	* gmodule-dld.c: put some comments into the files, and provided
+	better error checking for shl_findsym(). whish i had a system to
+ 	test this stuff on.
+
 Mon Aug 10 02:18:31 1998  Tim Janik  <timj@gtk.org>
 
 	* Makefile.am (lib_LTLIBRARIES): for now, skip the dependency on

gmodule/gmodule-dl.c

@@ -36,6 +36,15 @@
  * harmless defaults.
  * The Perl sources say, RTLD_LAZY needs to be defined as (1),
  * at least for Solaris 1.
+ *
+ * Mandatory:
+ * RTLD_LAZY   - resolve undefined symbols as code from the dynamic library
+ *		 is executed.
+ * RTLD_NOW    - resolve all undefined symbols before dlopen returns, and fail
+ *		 if this cannot be done.
+ * Optionally:
+ * RTLD_GLOBAL - the external symbols defined in the library will be made
+ *		 available to subsequently loaded libraries.
  */
 #ifndef	RTLD_GLOBAL
 #define	RTLD_GLOBAL	0
@@ -79,7 +88,7 @@ _g_module_self (void)
 }
 
 static void
-_g_module_close (gpointer        *handle_p,
+_g_module_close (gpointer	  handle,
 		 gboolean	  is_unref)
 {
   /* are there any systems out there that have dlopen()/dlclose()
@@ -89,18 +98,18 @@ _g_module_close (gpointer        *handle_p,
   
   if (is_unref)
     {
-      if (dlclose (*handle_p) != 0)
+      if (dlclose (handle) != 0)
 	g_module_set_error (dlerror ());
     }
 }
 
 static gpointer
-_g_module_symbol (gpointer       *handle_p,
+_g_module_symbol (gpointer	  handle,
 		  const gchar	 *symbol_name)
 {
   gpointer p;
   
-  p = dlsym (*handle_p, symbol_name);
+  p = dlsym (handle, symbol_name);
   if (!p)
     g_module_set_error (dlerror ());
   

gmodule/gmodule-dld.c

@@ -21,13 +21,37 @@
 
 /* some flags are missing on some systems, so we provide
  * harmless defaults.
+ *
+ * Mandatory:
+ * BIND_IMMEDIATE  - Resolve symbol references when the library is loaded.
+ * BIND_DEFERRED   - Delay code symbol resolution until actual reference.
+ *
+ * Optionally:
+ * BIND_FIRST	   - Place the library at the head of the symbol search order.
+ * BIND_NONFATAL   - The default BIND_IMMEDIATE behavior is to treat all unsatisfied
+ *		     symbols as fatal.	This flag allows binding of unsatisfied code
+ *		     symbols to be deferred until use.
+ *		     [Perl: For certain libraries, like DCE, deferred binding often
+ *		     causes run time problems.	Adding BIND_NONFATAL to BIND_IMMEDIATE
+ *		     still allows unresolved references in situations like this.]
+ * BIND_NOSTART	   - Do not call the initializer for the shared library when the
+ *		     library is loaded, nor on a future call to shl_unload().
+ * BIND_VERBOSE	   - Print verbose messages concerning possible unsatisfied symbols.
+ *
+ * hp9000s700/hp9000s800:
+ * BIND_RESTRICTED - Restrict symbols visible by the library to those present at
+ *		     library load time.
+ * DYNAMIC_PATH	   - Allow the loader to dynamically search for the library specified
+ *		     by the path argument.
  */
 #ifndef	DYNAMIC_PATH
 #define	DYNAMIC_PATH	0
 #endif	/* DYNAMIC_PATH */
+#ifndef	BIND_RESTRICTED
+#define	BIND_RESTRICTED	0
+#endif	/* BIND_RESTRICTED */
 
-/* should we have BIND_TOGETHER here as well? */
+#define	OPT_BIND_FLAGS	(BIND_NONFATAL | BIND_VERBOSE)
-#define	CONST_BIND_FLAGS	(BIND_NONFATAL | BIND_VERBOSE)
 
 
 /* --- functions --- */
@@ -35,48 +59,56 @@ static gpointer
 _g_module_open (const gchar    *file_name,
 		gboolean	bind_lazy)
 {
-  gpointer handle;
+  shl_t shl_handle;
   
-  handle = shl_load (file_name, CONST_BIND_FLAGS | (bind_lazy ? BIND_DEFERRED : BIND_IMMEDIATE), 0);
+  shl_handle = shl_load (file_name,
-  if (!handle)
+			 (bind_lazy ? BIND_DEFERRED : BIND_IMMEDIATE) | OPT_BIND_FLAGS, 0);
+  if (!shl_handle)
+    {
+      /* the hp-docs say we should better abort() if errno==ENOSYM ;( */
       g_module_set_error (g_strerror (errno));
+    }
   
-  return handle;
+  return (gpointer) shl_handle;
 }
 
 static gpointer
 _g_module_self (void)
 {
-  gpointer handle;
+  shl_t shl_handle;
   
-  handle = PROG_HANDLE;
+  shl_handle = PROG_HANDLE;
-  if (!handle)
+  if (!shl_handle)
     g_module_set_error (g_strerror (errno));
   
-  return handle;
+  return shl_handle;
 }
 
 static void
-_g_module_close (gpointer        *handle_p,
+_g_module_close (gpointer	  handle,
 		 gboolean	  is_unref)
 {
   if (!is_unref)
     {
-      if (shl_unload (*handle_p) != 0)
+      if (shl_unload ((shl_t) handle) != 0)
 	g_module_set_error (g_strerror (errno));
     }
 }
 
 static gpointer
-_g_module_symbol (gpointer       *handle_p,
+_g_module_symbol (gpointer	  handle,
 		  const gchar	 *symbol_name)
 {
   gpointer p = NULL;
   
   /* should we restrict lookups to TYPE_PROCEDURE?
    */
-  if (shl_findsym (handle_p, symbol_name, TYPE_UNDEFINED, &p) != 0 || p == NULL)
+  if (shl_findsym ((shl_t*) &handle, symbol_name, TYPE_UNDEFINED, &p) != 0 ||
+      handle == NULL || p == NULL)
+    {
+      /* the hp-docs say we should better abort() if errno==ENOSYM ;( */
       g_module_set_error (g_strerror (errno));
+    }
   
   return p;
 }

gmodule/gmodule.c

@@ -24,9 +24,10 @@
 
 /* We maintain a list of modules, so we can reference count them.
  * That's needed because some platforms don't support refernce counts on
- * modules (http://www.stat.umn.edu/~luke/xls/projects/dlbasics/dlbasics.html).
+ * modules e.g. the shl_* implementation of HP-UX
+ * (http://www.stat.umn.edu/~luke/xls/projects/dlbasics/dlbasics.html).
  * Also, the module for the program itself is kept seperatedly for
- * faster access.
+ * faster access and because it has special semantics.
  */
 
 
@@ -44,10 +45,10 @@ struct _GModule
 /* --- prototypes --- */
 static gpointer		_g_module_open		(const gchar	*file_name,
 						 gboolean	 bind_lazy);
-static void		_g_module_close		(gpointer	*handle_p,
+static void		_g_module_close		(gpointer	 handle,
 						 gboolean	 is_unref);
 static gpointer		_g_module_self		(void);
-static gpointer		_g_module_symbol	(gpointer	*handle_p,
+static gpointer		_g_module_symbol	(gpointer	 handle,
 						 const gchar	*symbol_name);
 static inline void	g_module_set_error	(const gchar	*error);
 static inline GModule*	g_module_find_by_handle (gpointer	 handle);
@@ -169,7 +170,7 @@ g_module_open (const gchar    *file_name,
       module = g_module_find_by_handle (handle);
       if (module)
 	{
-	  _g_module_close (&module->handle, TRUE);
+	  _g_module_close (module->handle, TRUE);
 	  module->ref_count++;
 	  g_module_set_error (NULL);
 	  
@@ -245,7 +246,7 @@ g_module_close (GModule        *module)
 	}
       module->next = NULL;
       
-      _g_module_close (&module->handle, FALSE);
+      _g_module_close (module->handle, FALSE);
       g_free (module->file_name);
       
       g_free (module);
@@ -275,10 +276,10 @@ g_module_symbol (GModule        *module,
   
 #ifdef	G_MODULE_NEED_USCORE
   symbol_name = g_strconcat ("_", symbol_name, NULL);
-  *symbol = _g_module_symbol (&module->handle, symbol_name);
+  *symbol = _g_module_symbol (module->handle, symbol_name);
   g_free (symbol_name);
 #else	/* !G_MODULE_NEED_USCORE */
-  *symbol = _g_module_symbol (&module->handle, symbol_name);
+  *symbol = _g_module_symbol (module->handle, symbol_name);
 #endif	/* !G_MODULE_NEED_USCORE */
   
   if (module_error)