1998-08-09 13:42:02 +02:00
|
|
|
/* GMODULE - GLIB wrapper code for dynamic module loading
|
|
|
|
* Copyright (C) 1998 Tim Janik
|
1998-08-09 10:32:18 +02:00
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Library General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
1998-08-10 03:36:18 +02:00
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
1998-08-09 10:32:18 +02:00
|
|
|
* Library General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Library General Public
|
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
1998-12-15 06:28:02 +01:00
|
|
|
|
1999-02-24 07:14:27 +01:00
|
|
|
/*
|
|
|
|
* Modified by the GLib Team and others 1997-1999. See the AUTHORS
|
|
|
|
* file for a list of people on the GLib Team. See the ChangeLog
|
|
|
|
* files for a list of changes. These files are distributed with
|
|
|
|
* GLib at ftp://ftp.gtk.org/pub/gtk/.
|
|
|
|
*/
|
|
|
|
|
1998-12-15 06:28:02 +01:00
|
|
|
/*
|
|
|
|
* MT safe
|
|
|
|
*/
|
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
#include "gmodule.h"
|
|
|
|
#include "gmoduleconf.h"
|
|
|
|
#include <errno.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
|
|
|
|
/* We maintain a list of modules, so we can reference count them.
|
|
|
|
* That's needed because some platforms don't support refernce counts on
|
1998-08-10 03:36:18 +02:00
|
|
|
* modules e.g. the shl_* implementation of HP-UX
|
|
|
|
* (http://www.stat.umn.edu/~luke/xls/projects/dlbasics/dlbasics.html).
|
1998-08-09 10:32:18 +02:00
|
|
|
* Also, the module for the program itself is kept seperatedly for
|
1998-08-10 03:36:18 +02:00
|
|
|
* faster access and because it has special semantics.
|
1998-08-09 10:32:18 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
/* --- structures --- */
|
|
|
|
struct _GModule
|
|
|
|
{
|
|
|
|
gchar *file_name;
|
|
|
|
gpointer handle;
|
1998-09-17 06:59:41 +02:00
|
|
|
guint ref_count : 31;
|
|
|
|
guint is_resident : 1;
|
1998-09-21 04:32:30 +02:00
|
|
|
GModuleUnload unload;
|
1998-08-09 10:32:18 +02:00
|
|
|
GModule *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* --- prototypes --- */
|
|
|
|
static gpointer _g_module_open (const gchar *file_name,
|
|
|
|
gboolean bind_lazy);
|
1998-08-10 03:36:18 +02:00
|
|
|
static void _g_module_close (gpointer handle,
|
1998-08-09 10:32:18 +02:00
|
|
|
gboolean is_unref);
|
|
|
|
static gpointer _g_module_self (void);
|
1998-08-10 03:36:18 +02:00
|
|
|
static gpointer _g_module_symbol (gpointer handle,
|
1998-08-09 10:32:18 +02:00
|
|
|
const gchar *symbol_name);
|
removed dummy structure definitions for struct _GCache, _GTree, _GTimer,
Tue Oct 27 03:00:50 1998 Tim Janik <timj@gtk.org>
* glib.h: removed dummy structure definitions for struct _GCache,
_GTree, _GTimer, _GMemChunk, _GListAllocator and _GStringChunk.
* gutils.c: implement glib's inline functions _after_ all include
statements have been processed.
removed Tor's MAXPATHLEN check since there already was one supplied
further down in this file.
(LibMain): special cased the #ifdef __LCC__ case for NATIVE_WIN32,
since lcc maybe used on other platforms as well. why in hell is this
stuff required?
(g_get_any_init): for windows, if the user name is supplied, use it as
realname also.
in general, if there is no homedir specified, use the tmpdir that
we already figured.
* gtimer.c (g_timer_elapsed): changed a g_assert() statement to
g_return_if_fail().
* applied glib-tml-981020-0.patch for WIN32 portability, added some
comments and g_return_if_fail() statements, minor indentation fixes.
ChangeLog entry from Tor Lillqvist is appended.
* glib.h (struct dirent): use lower case structure members.
* glib.h:
* makefile.lcc:
* makefile.msc:
s/COMPILING_GLIB/GLIB_COMPILATION/
1998-10-20: Tor Lillqvist <tml@iki.fi>
* README.win32 glib.def gmodule.def
* glibconfig.h.win32 gmodule/gmoduleconf.h.win32:
New files for the Windows port. The .def files list exported
symbols for the Microsoft linker and compatibles.
* configure.in:
Added checks for some platform-dependent headers: pwd.h sys/param.h
sys/select.h sys/time.h sys/times.h unistd.h, and the function lstat.
* gerror.c:
Conditionalized inclusion of system-dependent headers. Changes
for Windows: no gdb to do a stack trace. Just call abort().
* glib.h:
Changes for Windows:
Added macros G_DIR_SEPARATOR, G_DIR_SEPARATOR_S for
platform-dependent file name syntax elements. Added macros
G_SEARCHPATH_SEPARATOR, G_SEARCHPATH_SEPARATOR_S for
platform-dependent search path syntax conventions.
Added pragmas for Microsoft C to make it more pedantic.
Marked GLib's global variables for export from DLL.
Added the function g_strescape that escapes backslashes.
Added functions g_path_is_absolute and g_path_skip_root to
handle platform-dependent file name syntax.
Added the function g_getenv that expands environment variables
that contain references to other environment variables, as is
typical on Windows NT.
Added the GIOChannel structure which is used to encapsulate the
IPC mechanism used by the GIMP's plug-ins, and possibly other
things later. On Unix a GIOChannel encapsulates just a file
descriptor. On Windows it contains a file handle from _pipe() and a
few other things related to the implementation of gdk_input_add
and GIMP plug-in communication. Subject to change.
Removed duplicate declarations of the version variables.
For the Microsoft compiler, declare own implementation of
ftruncate and the <dirent.h> functions.
* gmem.c:
Define a symbolic name for the profiling table size.
* gmessages.c:
Conditionalized inclusion of unistd.h. On Windows, output using
stdio to stdout.
* gscanner.c:
Conditionalized inclusion of unistd.h. Added changes for
Microsoft C. Added CR to the skipped character set. Added small
workaround for MSC compiler bug in g_scanner_cur_value.
* gstrfuncs.c:
Added the function g_strescape, which escapes the backslash
character. Needed especially when printing Windows filenames.
* gtimer.c:
Conditionalized inclusion of unistd.h and sys/time.h. Added
implementations for Windows.
* gutils.c:
Conditionalized inclusion of platform-dependent headers. Use
the platform-independent file name syntax macros.
Conditionalize code on platform-dependent features. Added the
functions g_path_is_absolute g_path_skip_root and g_getenv.
Added the GIOChannel-related functions. Added
compiler-dependent Unix compatibility functions for Windows.
* makefile.lcc makefile.msc:
New files. Compiler-specific makefiles for LCC-Win32 and
Microsoft C. Only Microsoft C is actually supported currently.
* testglib.c:
Added pathname check cases for Windows. Added workaround for
bug in the Microsoft runtime library. Improved some tests a bit.
Tue Oct 27 04:00:11 1998 Tim Janik <timj@gtk.org>
* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
this needs to be more constistent throughout the code, do we go for
NATIVE_WIN32 or WIN32?
* gmodule.c (LibMain): special cased the #ifdef __LCC__ case for
NATIVE_WIN32, since lcc maybe used on other platforms as well.
* libgplugin_a.c (LibMain):
* libgplugin_b.c (LibMain):
likewise. not sure i like this special requirement for lcc in here.
* gmodule-dl.c (_g_module_build_path):
feature empty "" directories and prepend the module name with "lib".
* gmodule-dld.c (_g_module_build_path):
* gmodule-win32.c (_g_module_build_path):
feature empty "" directories.
* we need some more magic in the _g_module_build_path variants
so we don't append/prepend lib and .so, .sl or .dll for those names
that already contain it.
* applied patch from Tor Lillqvist for g_module_build_path() and
windows support.
1998-10-20: Tor Lillqvist <tml@iki.fi>
* gmodule/gmodule-win32.c:
New file.
* gmodule/gmodule.c gmodule/gmodule.h:
Added the funcion g_module_build_path that builds the path to
a module file, decorating the name according to the system's
conventions. Added the Windows implementation.
* gmodule/libgplugin_a.c gmodule/libgplugin_b.c:
Added LibMain for LCC-Win32.
* gmodule/testgmodule.c:
Handle Windows dll names.
1998-10-27 05:11:34 +01:00
|
|
|
static gchar* _g_module_build_path (const gchar *directory,
|
|
|
|
const gchar *module_name);
|
1998-08-09 10:32:18 +02:00
|
|
|
static inline void g_module_set_error (const gchar *error);
|
|
|
|
static inline GModule* g_module_find_by_handle (gpointer handle);
|
|
|
|
static inline GModule* g_module_find_by_name (const gchar *name);
|
|
|
|
|
|
|
|
|
|
|
|
/* --- variables --- */
|
1999-02-10 10:40:46 +01:00
|
|
|
G_LOCK_DEFINE_STATIC (GModule);
|
1998-12-15 06:28:02 +01:00
|
|
|
const char *g_log_domain_gmodule = "GModule";
|
|
|
|
static GModule *modules = NULL;
|
|
|
|
static GModule *main_module = NULL;
|
|
|
|
static GStaticPrivate module_error_private = G_STATIC_PRIVATE_INIT;
|
1998-08-09 10:32:18 +02:00
|
|
|
|
|
|
|
|
|
|
|
/* --- inline functions --- */
|
|
|
|
static inline GModule*
|
|
|
|
g_module_find_by_handle (gpointer handle)
|
|
|
|
{
|
|
|
|
GModule *module;
|
1998-12-15 06:28:02 +01:00
|
|
|
GModule *retval = NULL;
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-12-16 06:38:35 +01:00
|
|
|
G_LOCK (GModule);
|
1998-08-09 15:13:12 +02:00
|
|
|
if (main_module && main_module->handle == handle)
|
1998-12-15 06:28:02 +01:00
|
|
|
retval = main_module;
|
|
|
|
else
|
|
|
|
for (module = modules; module; module = module->next)
|
|
|
|
if (handle == module->handle)
|
|
|
|
{
|
|
|
|
retval = module;
|
|
|
|
break;
|
|
|
|
}
|
1998-12-16 06:38:35 +01:00
|
|
|
G_UNLOCK (GModule);
|
1998-12-15 06:28:02 +01:00
|
|
|
|
|
|
|
return retval;
|
1998-08-09 10:32:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline GModule*
|
|
|
|
g_module_find_by_name (const gchar *name)
|
|
|
|
{
|
|
|
|
GModule *module;
|
1998-12-15 06:28:02 +01:00
|
|
|
GModule *retval = NULL;
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-12-16 06:38:35 +01:00
|
|
|
G_LOCK (GModule);
|
1998-08-09 10:32:18 +02:00
|
|
|
for (module = modules; module; module = module->next)
|
|
|
|
if (strcmp (name, module->file_name) == 0)
|
1998-12-15 06:28:02 +01:00
|
|
|
{
|
|
|
|
retval = module;
|
|
|
|
break;
|
|
|
|
}
|
1998-12-16 06:38:35 +01:00
|
|
|
G_UNLOCK (GModule);
|
1998-12-15 06:28:02 +01:00
|
|
|
|
|
|
|
return retval;
|
1998-08-09 10:32:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
g_module_set_error (const gchar *error)
|
|
|
|
{
|
1999-02-10 09:06:26 +01:00
|
|
|
g_static_private_set (&module_error_private, g_strdup (error), g_free);
|
1998-08-09 10:32:18 +02:00
|
|
|
errno = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* --- include platform specifc code --- */
|
|
|
|
#define CHECK_ERROR(rv) { g_module_set_error (NULL); }
|
|
|
|
#if (G_MODULE_IMPL == G_MODULE_IMPL_DL)
|
|
|
|
#include "gmodule-dl.c"
|
|
|
|
#elif (G_MODULE_IMPL == G_MODULE_IMPL_DLD)
|
|
|
|
#include "gmodule-dld.c"
|
removed dummy structure definitions for struct _GCache, _GTree, _GTimer,
Tue Oct 27 03:00:50 1998 Tim Janik <timj@gtk.org>
* glib.h: removed dummy structure definitions for struct _GCache,
_GTree, _GTimer, _GMemChunk, _GListAllocator and _GStringChunk.
* gutils.c: implement glib's inline functions _after_ all include
statements have been processed.
removed Tor's MAXPATHLEN check since there already was one supplied
further down in this file.
(LibMain): special cased the #ifdef __LCC__ case for NATIVE_WIN32,
since lcc maybe used on other platforms as well. why in hell is this
stuff required?
(g_get_any_init): for windows, if the user name is supplied, use it as
realname also.
in general, if there is no homedir specified, use the tmpdir that
we already figured.
* gtimer.c (g_timer_elapsed): changed a g_assert() statement to
g_return_if_fail().
* applied glib-tml-981020-0.patch for WIN32 portability, added some
comments and g_return_if_fail() statements, minor indentation fixes.
ChangeLog entry from Tor Lillqvist is appended.
* glib.h (struct dirent): use lower case structure members.
* glib.h:
* makefile.lcc:
* makefile.msc:
s/COMPILING_GLIB/GLIB_COMPILATION/
1998-10-20: Tor Lillqvist <tml@iki.fi>
* README.win32 glib.def gmodule.def
* glibconfig.h.win32 gmodule/gmoduleconf.h.win32:
New files for the Windows port. The .def files list exported
symbols for the Microsoft linker and compatibles.
* configure.in:
Added checks for some platform-dependent headers: pwd.h sys/param.h
sys/select.h sys/time.h sys/times.h unistd.h, and the function lstat.
* gerror.c:
Conditionalized inclusion of system-dependent headers. Changes
for Windows: no gdb to do a stack trace. Just call abort().
* glib.h:
Changes for Windows:
Added macros G_DIR_SEPARATOR, G_DIR_SEPARATOR_S for
platform-dependent file name syntax elements. Added macros
G_SEARCHPATH_SEPARATOR, G_SEARCHPATH_SEPARATOR_S for
platform-dependent search path syntax conventions.
Added pragmas for Microsoft C to make it more pedantic.
Marked GLib's global variables for export from DLL.
Added the function g_strescape that escapes backslashes.
Added functions g_path_is_absolute and g_path_skip_root to
handle platform-dependent file name syntax.
Added the function g_getenv that expands environment variables
that contain references to other environment variables, as is
typical on Windows NT.
Added the GIOChannel structure which is used to encapsulate the
IPC mechanism used by the GIMP's plug-ins, and possibly other
things later. On Unix a GIOChannel encapsulates just a file
descriptor. On Windows it contains a file handle from _pipe() and a
few other things related to the implementation of gdk_input_add
and GIMP plug-in communication. Subject to change.
Removed duplicate declarations of the version variables.
For the Microsoft compiler, declare own implementation of
ftruncate and the <dirent.h> functions.
* gmem.c:
Define a symbolic name for the profiling table size.
* gmessages.c:
Conditionalized inclusion of unistd.h. On Windows, output using
stdio to stdout.
* gscanner.c:
Conditionalized inclusion of unistd.h. Added changes for
Microsoft C. Added CR to the skipped character set. Added small
workaround for MSC compiler bug in g_scanner_cur_value.
* gstrfuncs.c:
Added the function g_strescape, which escapes the backslash
character. Needed especially when printing Windows filenames.
* gtimer.c:
Conditionalized inclusion of unistd.h and sys/time.h. Added
implementations for Windows.
* gutils.c:
Conditionalized inclusion of platform-dependent headers. Use
the platform-independent file name syntax macros.
Conditionalize code on platform-dependent features. Added the
functions g_path_is_absolute g_path_skip_root and g_getenv.
Added the GIOChannel-related functions. Added
compiler-dependent Unix compatibility functions for Windows.
* makefile.lcc makefile.msc:
New files. Compiler-specific makefiles for LCC-Win32 and
Microsoft C. Only Microsoft C is actually supported currently.
* testglib.c:
Added pathname check cases for Windows. Added workaround for
bug in the Microsoft runtime library. Improved some tests a bit.
Tue Oct 27 04:00:11 1998 Tim Janik <timj@gtk.org>
* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
this needs to be more constistent throughout the code, do we go for
NATIVE_WIN32 or WIN32?
* gmodule.c (LibMain): special cased the #ifdef __LCC__ case for
NATIVE_WIN32, since lcc maybe used on other platforms as well.
* libgplugin_a.c (LibMain):
* libgplugin_b.c (LibMain):
likewise. not sure i like this special requirement for lcc in here.
* gmodule-dl.c (_g_module_build_path):
feature empty "" directories and prepend the module name with "lib".
* gmodule-dld.c (_g_module_build_path):
* gmodule-win32.c (_g_module_build_path):
feature empty "" directories.
* we need some more magic in the _g_module_build_path variants
so we don't append/prepend lib and .so, .sl or .dll for those names
that already contain it.
* applied patch from Tor Lillqvist for g_module_build_path() and
windows support.
1998-10-20: Tor Lillqvist <tml@iki.fi>
* gmodule/gmodule-win32.c:
New file.
* gmodule/gmodule.c gmodule/gmodule.h:
Added the funcion g_module_build_path that builds the path to
a module file, decorating the name according to the system's
conventions. Added the Windows implementation.
* gmodule/libgplugin_a.c gmodule/libgplugin_b.c:
Added LibMain for LCC-Win32.
* gmodule/testgmodule.c:
Handle Windows dll names.
1998-10-27 05:11:34 +01:00
|
|
|
#elif (G_MODULE_IMPL == G_MODULE_IMPL_WIN32)
|
|
|
|
#include "gmodule-win32.c"
|
1998-08-09 10:32:18 +02:00
|
|
|
#else
|
|
|
|
#undef CHECK_ERROR
|
1999-02-10 12:15:13 +01:00
|
|
|
#define CHECK_ERROR(rv) { g_module_set_error ("dynamic modules are " \
|
|
|
|
"not supported by this system"); return rv; }
|
1998-08-20 07:10:27 +02:00
|
|
|
static gpointer
|
|
|
|
_g_module_open (const gchar *file_name,
|
|
|
|
gboolean bind_lazy)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
static void
|
|
|
|
_g_module_close (gpointer handle,
|
|
|
|
gboolean is_unref)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
static gpointer
|
|
|
|
_g_module_self (void)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
static gpointer
|
|
|
|
_g_module_symbol (gpointer handle,
|
|
|
|
const gchar *symbol_name)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
1998-11-20 14:49:35 +01:00
|
|
|
static gchar*
|
|
|
|
_g_module_build_path (const gchar *directory,
|
|
|
|
const gchar *module_name)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
1998-08-09 10:32:18 +02:00
|
|
|
#endif /* no implementation */
|
|
|
|
|
removed dummy structure definitions for struct _GCache, _GTree, _GTimer,
Tue Oct 27 03:00:50 1998 Tim Janik <timj@gtk.org>
* glib.h: removed dummy structure definitions for struct _GCache,
_GTree, _GTimer, _GMemChunk, _GListAllocator and _GStringChunk.
* gutils.c: implement glib's inline functions _after_ all include
statements have been processed.
removed Tor's MAXPATHLEN check since there already was one supplied
further down in this file.
(LibMain): special cased the #ifdef __LCC__ case for NATIVE_WIN32,
since lcc maybe used on other platforms as well. why in hell is this
stuff required?
(g_get_any_init): for windows, if the user name is supplied, use it as
realname also.
in general, if there is no homedir specified, use the tmpdir that
we already figured.
* gtimer.c (g_timer_elapsed): changed a g_assert() statement to
g_return_if_fail().
* applied glib-tml-981020-0.patch for WIN32 portability, added some
comments and g_return_if_fail() statements, minor indentation fixes.
ChangeLog entry from Tor Lillqvist is appended.
* glib.h (struct dirent): use lower case structure members.
* glib.h:
* makefile.lcc:
* makefile.msc:
s/COMPILING_GLIB/GLIB_COMPILATION/
1998-10-20: Tor Lillqvist <tml@iki.fi>
* README.win32 glib.def gmodule.def
* glibconfig.h.win32 gmodule/gmoduleconf.h.win32:
New files for the Windows port. The .def files list exported
symbols for the Microsoft linker and compatibles.
* configure.in:
Added checks for some platform-dependent headers: pwd.h sys/param.h
sys/select.h sys/time.h sys/times.h unistd.h, and the function lstat.
* gerror.c:
Conditionalized inclusion of system-dependent headers. Changes
for Windows: no gdb to do a stack trace. Just call abort().
* glib.h:
Changes for Windows:
Added macros G_DIR_SEPARATOR, G_DIR_SEPARATOR_S for
platform-dependent file name syntax elements. Added macros
G_SEARCHPATH_SEPARATOR, G_SEARCHPATH_SEPARATOR_S for
platform-dependent search path syntax conventions.
Added pragmas for Microsoft C to make it more pedantic.
Marked GLib's global variables for export from DLL.
Added the function g_strescape that escapes backslashes.
Added functions g_path_is_absolute and g_path_skip_root to
handle platform-dependent file name syntax.
Added the function g_getenv that expands environment variables
that contain references to other environment variables, as is
typical on Windows NT.
Added the GIOChannel structure which is used to encapsulate the
IPC mechanism used by the GIMP's plug-ins, and possibly other
things later. On Unix a GIOChannel encapsulates just a file
descriptor. On Windows it contains a file handle from _pipe() and a
few other things related to the implementation of gdk_input_add
and GIMP plug-in communication. Subject to change.
Removed duplicate declarations of the version variables.
For the Microsoft compiler, declare own implementation of
ftruncate and the <dirent.h> functions.
* gmem.c:
Define a symbolic name for the profiling table size.
* gmessages.c:
Conditionalized inclusion of unistd.h. On Windows, output using
stdio to stdout.
* gscanner.c:
Conditionalized inclusion of unistd.h. Added changes for
Microsoft C. Added CR to the skipped character set. Added small
workaround for MSC compiler bug in g_scanner_cur_value.
* gstrfuncs.c:
Added the function g_strescape, which escapes the backslash
character. Needed especially when printing Windows filenames.
* gtimer.c:
Conditionalized inclusion of unistd.h and sys/time.h. Added
implementations for Windows.
* gutils.c:
Conditionalized inclusion of platform-dependent headers. Use
the platform-independent file name syntax macros.
Conditionalize code on platform-dependent features. Added the
functions g_path_is_absolute g_path_skip_root and g_getenv.
Added the GIOChannel-related functions. Added
compiler-dependent Unix compatibility functions for Windows.
* makefile.lcc makefile.msc:
New files. Compiler-specific makefiles for LCC-Win32 and
Microsoft C. Only Microsoft C is actually supported currently.
* testglib.c:
Added pathname check cases for Windows. Added workaround for
bug in the Microsoft runtime library. Improved some tests a bit.
Tue Oct 27 04:00:11 1998 Tim Janik <timj@gtk.org>
* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
this needs to be more constistent throughout the code, do we go for
NATIVE_WIN32 or WIN32?
* gmodule.c (LibMain): special cased the #ifdef __LCC__ case for
NATIVE_WIN32, since lcc maybe used on other platforms as well.
* libgplugin_a.c (LibMain):
* libgplugin_b.c (LibMain):
likewise. not sure i like this special requirement for lcc in here.
* gmodule-dl.c (_g_module_build_path):
feature empty "" directories and prepend the module name with "lib".
* gmodule-dld.c (_g_module_build_path):
* gmodule-win32.c (_g_module_build_path):
feature empty "" directories.
* we need some more magic in the _g_module_build_path variants
so we don't append/prepend lib and .so, .sl or .dll for those names
that already contain it.
* applied patch from Tor Lillqvist for g_module_build_path() and
windows support.
1998-10-20: Tor Lillqvist <tml@iki.fi>
* gmodule/gmodule-win32.c:
New file.
* gmodule/gmodule.c gmodule/gmodule.h:
Added the funcion g_module_build_path that builds the path to
a module file, decorating the name according to the system's
conventions. Added the Windows implementation.
* gmodule/libgplugin_a.c gmodule/libgplugin_b.c:
Added LibMain for LCC-Win32.
* gmodule/testgmodule.c:
Handle Windows dll names.
1998-10-27 05:11:34 +01:00
|
|
|
#if defined (NATIVE_WIN32) && defined (__LCC__)
|
|
|
|
int __stdcall
|
|
|
|
LibMain (void *hinstDll,
|
|
|
|
unsigned long dwReason,
|
|
|
|
void *reserved)
|
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif /* NATIVE_WIN32 && __LCC__ */
|
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
|
|
|
|
/* --- functions --- */
|
|
|
|
gboolean
|
|
|
|
g_module_supported (void)
|
|
|
|
{
|
|
|
|
CHECK_ERROR (FALSE);
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
GModule*
|
|
|
|
g_module_open (const gchar *file_name,
|
|
|
|
GModuleFlags flags)
|
|
|
|
{
|
|
|
|
GModule *module;
|
|
|
|
gpointer handle;
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
CHECK_ERROR (NULL);
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
if (!file_name)
|
1998-12-15 06:28:02 +01:00
|
|
|
{
|
1998-12-16 06:38:35 +01:00
|
|
|
G_LOCK (GModule);
|
1998-08-09 10:32:18 +02:00
|
|
|
if (!main_module)
|
|
|
|
{
|
|
|
|
handle = _g_module_self ();
|
|
|
|
if (handle)
|
|
|
|
{
|
|
|
|
main_module = g_new (GModule, 1);
|
|
|
|
main_module->file_name = NULL;
|
1998-08-09 13:39:50 +02:00
|
|
|
main_module->handle = handle;
|
1998-08-09 10:32:18 +02:00
|
|
|
main_module->ref_count = 1;
|
1998-09-17 06:59:41 +02:00
|
|
|
main_module->is_resident = TRUE;
|
1998-09-21 04:32:30 +02:00
|
|
|
main_module->unload = NULL;
|
1998-08-09 10:32:18 +02:00
|
|
|
main_module->next = NULL;
|
|
|
|
}
|
|
|
|
}
|
1998-12-16 06:38:35 +01:00
|
|
|
G_UNLOCK (GModule);
|
1998-12-15 06:28:02 +01:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
return main_module;
|
|
|
|
}
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
/* we first search the module list by name */
|
|
|
|
module = g_module_find_by_name (file_name);
|
|
|
|
if (module)
|
|
|
|
{
|
|
|
|
module->ref_count++;
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
return module;
|
|
|
|
}
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
/* open the module */
|
|
|
|
handle = _g_module_open (file_name, (flags & G_MODULE_BIND_LAZY) != 0);
|
|
|
|
if (handle)
|
|
|
|
{
|
1998-08-09 13:39:50 +02:00
|
|
|
gchar *saved_error;
|
|
|
|
GModuleCheckInit check_init;
|
1998-08-17 04:40:30 +02:00
|
|
|
const gchar *check_failed = NULL;
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
/* search the module list by handle, since file names are not unique */
|
|
|
|
module = g_module_find_by_handle (handle);
|
|
|
|
if (module)
|
|
|
|
{
|
1998-08-10 03:36:18 +02:00
|
|
|
_g_module_close (module->handle, TRUE);
|
1998-08-09 10:32:18 +02:00
|
|
|
module->ref_count++;
|
|
|
|
g_module_set_error (NULL);
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
return module;
|
|
|
|
}
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1999-02-10 09:06:26 +01:00
|
|
|
saved_error = g_strdup (g_module_error ());
|
1998-08-09 13:39:50 +02:00
|
|
|
g_module_set_error (NULL);
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
module = g_new (GModule, 1);
|
|
|
|
module->file_name = g_strdup (file_name);
|
|
|
|
module->handle = handle;
|
1998-08-09 15:13:12 +02:00
|
|
|
module->ref_count = 1;
|
1998-09-17 06:59:41 +02:00
|
|
|
module->is_resident = FALSE;
|
1998-09-21 04:32:30 +02:00
|
|
|
module->unload = NULL;
|
1998-12-16 06:38:35 +01:00
|
|
|
G_LOCK (GModule);
|
1998-08-09 15:13:12 +02:00
|
|
|
module->next = modules;
|
|
|
|
modules = module;
|
1998-12-16 06:38:35 +01:00
|
|
|
G_UNLOCK (GModule);
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 13:39:50 +02:00
|
|
|
/* check initialization */
|
1998-08-10 02:26:44 +02:00
|
|
|
if (g_module_symbol (module, "g_module_check_init", (gpointer) &check_init))
|
1998-08-09 13:39:50 +02:00
|
|
|
check_failed = check_init (module);
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-09-21 04:32:30 +02:00
|
|
|
/* we don't call unload() if the initialization check failed. */
|
1998-08-09 13:39:50 +02:00
|
|
|
if (!check_failed)
|
1998-09-21 04:32:30 +02:00
|
|
|
g_module_symbol (module, "g_module_unload", (gpointer) &module->unload);
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 13:39:50 +02:00
|
|
|
if (check_failed)
|
|
|
|
{
|
1998-08-17 04:40:30 +02:00
|
|
|
gchar *error;
|
|
|
|
|
|
|
|
error = g_strconcat ("GModule initialization check failed: ", check_failed, NULL);
|
1998-08-09 13:39:50 +02:00
|
|
|
g_module_close (module);
|
|
|
|
module = NULL;
|
1998-08-17 04:40:30 +02:00
|
|
|
g_module_set_error (error);
|
|
|
|
g_free (error);
|
1998-08-09 13:39:50 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
g_module_set_error (saved_error);
|
1999-02-10 09:06:26 +01:00
|
|
|
|
1998-08-09 13:39:50 +02:00
|
|
|
g_free (saved_error);
|
1998-08-09 10:32:18 +02:00
|
|
|
}
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 13:39:50 +02:00
|
|
|
return module;
|
1998-08-09 10:32:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
1998-08-10 03:36:18 +02:00
|
|
|
g_module_close (GModule *module)
|
1998-08-09 10:32:18 +02:00
|
|
|
{
|
|
|
|
CHECK_ERROR (FALSE);
|
1998-08-09 15:13:12 +02:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
g_return_val_if_fail (module != NULL, FALSE);
|
|
|
|
g_return_val_if_fail (module->ref_count > 0, FALSE);
|
1998-08-09 15:13:12 +02:00
|
|
|
|
1998-09-17 06:59:41 +02:00
|
|
|
module->ref_count--;
|
1998-08-09 15:13:12 +02:00
|
|
|
|
1998-09-21 04:32:30 +02:00
|
|
|
if (!module->ref_count && !module->is_resident && module->unload)
|
1998-09-17 06:59:41 +02:00
|
|
|
{
|
1998-09-21 04:32:30 +02:00
|
|
|
GModuleUnload unload;
|
1998-09-17 06:59:41 +02:00
|
|
|
|
1998-09-21 04:32:30 +02:00
|
|
|
unload = module->unload;
|
|
|
|
module->unload = NULL;
|
|
|
|
unload (module);
|
1998-09-17 06:59:41 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!module->ref_count && !module->is_resident)
|
1998-08-09 10:32:18 +02:00
|
|
|
{
|
|
|
|
GModule *last;
|
|
|
|
GModule *node;
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
last = NULL;
|
1998-12-15 06:28:02 +01:00
|
|
|
|
1998-12-16 06:38:35 +01:00
|
|
|
G_LOCK (GModule);
|
1998-08-09 10:32:18 +02:00
|
|
|
node = modules;
|
|
|
|
while (node)
|
|
|
|
{
|
|
|
|
if (node == module)
|
|
|
|
{
|
|
|
|
if (last)
|
|
|
|
last->next = node->next;
|
|
|
|
else
|
|
|
|
modules = node->next;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
last = node;
|
|
|
|
node = last->next;
|
|
|
|
}
|
1998-08-09 13:39:50 +02:00
|
|
|
module->next = NULL;
|
1998-12-16 06:38:35 +01:00
|
|
|
G_UNLOCK (GModule);
|
1998-08-10 03:36:18 +02:00
|
|
|
|
|
|
|
_g_module_close (module->handle, FALSE);
|
1998-08-09 13:39:50 +02:00
|
|
|
g_free (module->file_name);
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
g_free (module);
|
|
|
|
}
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-12-15 06:28:02 +01:00
|
|
|
return g_module_error() == NULL;
|
1998-08-09 10:32:18 +02:00
|
|
|
}
|
|
|
|
|
1998-09-17 06:59:41 +02:00
|
|
|
void
|
|
|
|
g_module_make_resident (GModule *module)
|
|
|
|
{
|
|
|
|
g_return_if_fail (module != NULL);
|
|
|
|
|
|
|
|
module->is_resident = TRUE;
|
|
|
|
}
|
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
gchar*
|
|
|
|
g_module_error (void)
|
|
|
|
{
|
1998-12-15 06:28:02 +01:00
|
|
|
return g_static_private_get (&module_error_private);
|
1998-08-09 10:32:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
gboolean
|
1998-08-10 03:36:18 +02:00
|
|
|
g_module_symbol (GModule *module,
|
|
|
|
const gchar *symbol_name,
|
version bump to 1.1.3, binary age 0, interface age 0.
Sun Aug 16 20:28:27 1998 Tim Janik <timj@gtk.org>
* version bump to 1.1.3, binary age 0, interface age 0.
* glib.h: be nice to platforms that don't have gint64 and don't
issue #warning on every compilation. since glib doesn't require
gint64 itself, packages that need gint64 should test for this
themselves.
* glib.h:
* gutils.c: added a new function g_vsnprintf().
Fri Aug 14 16:41:53 1998 Tim Janik <timj@gtk.org>
* glib.h: added static inline functions for bit mask tests:
g_bit_nth_lsf, g_bit_nth_msf and g_bit_storage.
Fri Aug 13 14:23:37 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gmessages.c:
revised the message handling system, which is now based on a new
mechanism g_log*. most of the assertment macros got adapted to
feature the new g_log() call with an additional specification of
the log level in a preprocessor macro G_LOG_DOMAIN. if G_LOG_DOMAIN
is undefined upon the includion of glib.h, it'll be defined with a
value of (NULL) and thus preserves the original bahaviour for
warning and error messages. the message handler setting functions
for g_warning, g_error and g_message are only provided for backwards
compatibility and might get removed somewhen.
* Makefile.am: feature the G_LOG_DOMAIN macro to set the log domain
to "GLib" upon compilation. we currently have to add this definition
to the DEFS variable.
* testglib.c: we need an ugly #undef G_LOG_DOMAIN at the start
of this file currently, since automake doesn't support per target
_CFLAGS yet.
* glib.h: changed some gints to gbooleans, made a few const corrections,
removed some superfluous G_STMT_START{}G_STMT_END wrappers, added some
in other required places.
* gnode.c:
(g_node_prepend):
(g_node_insert_before):
(g_node_insert):
(g_node_append_data):
(g_node_prepend_data):
(g_node_insert_data_before):
(g_node_insert_data):
(g_node_append):
return (node), so these macros/functions can be usefully chained with
g_node_new().
[GModule]
Fri Aug 14 02:24:39 1998 Tim Janik <timj@gtk.org>
* Makefile.am: feature the G_LOG_DOMAIN macro to set the log domain
to "GModule" upon compilation. we currently have to add this definition
to the DEFS variable.
* testgmodule.c: we need an ugly #undef G_LOG_DOMAIN at the start
of this file currently, since automake doesn't support per target
_CFLAGS yet.
1998-08-16 23:14:11 +02:00
|
|
|
gpointer *symbol)
|
1998-08-09 10:32:18 +02:00
|
|
|
{
|
1998-12-15 06:28:02 +01:00
|
|
|
gchar *module_error;
|
1998-08-09 10:32:18 +02:00
|
|
|
if (symbol)
|
|
|
|
*symbol = NULL;
|
|
|
|
CHECK_ERROR (FALSE);
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
g_return_val_if_fail (module != NULL, FALSE);
|
|
|
|
g_return_val_if_fail (symbol_name != NULL, FALSE);
|
|
|
|
g_return_val_if_fail (symbol != NULL, FALSE);
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
#ifdef G_MODULE_NEED_USCORE
|
1998-10-21 20:04:47 +02:00
|
|
|
{
|
|
|
|
gchar *name;
|
|
|
|
|
|
|
|
name = g_strconcat ("_", symbol_name, NULL);
|
|
|
|
*symbol = _g_module_symbol (module->handle, name);
|
|
|
|
g_free (name);
|
|
|
|
}
|
1998-08-09 10:32:18 +02:00
|
|
|
#else /* !G_MODULE_NEED_USCORE */
|
1998-08-10 03:36:18 +02:00
|
|
|
*symbol = _g_module_symbol (module->handle, symbol_name);
|
1998-08-09 10:32:18 +02:00
|
|
|
#endif /* !G_MODULE_NEED_USCORE */
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-12-15 06:28:02 +01:00
|
|
|
if ((module_error = g_module_error()))
|
1998-08-09 10:32:18 +02:00
|
|
|
{
|
1998-08-17 04:40:30 +02:00
|
|
|
gchar *error;
|
|
|
|
|
|
|
|
error = g_strconcat ("`", symbol_name, "': ", module_error, NULL);
|
|
|
|
g_module_set_error (error);
|
|
|
|
g_free (error);
|
1998-08-09 10:32:18 +02:00
|
|
|
*symbol = NULL;
|
|
|
|
return FALSE;
|
|
|
|
}
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
gchar*
|
|
|
|
g_module_name (GModule *module)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (module != NULL, NULL);
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
if (module == main_module)
|
|
|
|
return "main";
|
1998-08-10 03:36:18 +02:00
|
|
|
|
1998-08-09 10:32:18 +02:00
|
|
|
return module->file_name;
|
|
|
|
}
|
removed dummy structure definitions for struct _GCache, _GTree, _GTimer,
Tue Oct 27 03:00:50 1998 Tim Janik <timj@gtk.org>
* glib.h: removed dummy structure definitions for struct _GCache,
_GTree, _GTimer, _GMemChunk, _GListAllocator and _GStringChunk.
* gutils.c: implement glib's inline functions _after_ all include
statements have been processed.
removed Tor's MAXPATHLEN check since there already was one supplied
further down in this file.
(LibMain): special cased the #ifdef __LCC__ case for NATIVE_WIN32,
since lcc maybe used on other platforms as well. why in hell is this
stuff required?
(g_get_any_init): for windows, if the user name is supplied, use it as
realname also.
in general, if there is no homedir specified, use the tmpdir that
we already figured.
* gtimer.c (g_timer_elapsed): changed a g_assert() statement to
g_return_if_fail().
* applied glib-tml-981020-0.patch for WIN32 portability, added some
comments and g_return_if_fail() statements, minor indentation fixes.
ChangeLog entry from Tor Lillqvist is appended.
* glib.h (struct dirent): use lower case structure members.
* glib.h:
* makefile.lcc:
* makefile.msc:
s/COMPILING_GLIB/GLIB_COMPILATION/
1998-10-20: Tor Lillqvist <tml@iki.fi>
* README.win32 glib.def gmodule.def
* glibconfig.h.win32 gmodule/gmoduleconf.h.win32:
New files for the Windows port. The .def files list exported
symbols for the Microsoft linker and compatibles.
* configure.in:
Added checks for some platform-dependent headers: pwd.h sys/param.h
sys/select.h sys/time.h sys/times.h unistd.h, and the function lstat.
* gerror.c:
Conditionalized inclusion of system-dependent headers. Changes
for Windows: no gdb to do a stack trace. Just call abort().
* glib.h:
Changes for Windows:
Added macros G_DIR_SEPARATOR, G_DIR_SEPARATOR_S for
platform-dependent file name syntax elements. Added macros
G_SEARCHPATH_SEPARATOR, G_SEARCHPATH_SEPARATOR_S for
platform-dependent search path syntax conventions.
Added pragmas for Microsoft C to make it more pedantic.
Marked GLib's global variables for export from DLL.
Added the function g_strescape that escapes backslashes.
Added functions g_path_is_absolute and g_path_skip_root to
handle platform-dependent file name syntax.
Added the function g_getenv that expands environment variables
that contain references to other environment variables, as is
typical on Windows NT.
Added the GIOChannel structure which is used to encapsulate the
IPC mechanism used by the GIMP's plug-ins, and possibly other
things later. On Unix a GIOChannel encapsulates just a file
descriptor. On Windows it contains a file handle from _pipe() and a
few other things related to the implementation of gdk_input_add
and GIMP plug-in communication. Subject to change.
Removed duplicate declarations of the version variables.
For the Microsoft compiler, declare own implementation of
ftruncate and the <dirent.h> functions.
* gmem.c:
Define a symbolic name for the profiling table size.
* gmessages.c:
Conditionalized inclusion of unistd.h. On Windows, output using
stdio to stdout.
* gscanner.c:
Conditionalized inclusion of unistd.h. Added changes for
Microsoft C. Added CR to the skipped character set. Added small
workaround for MSC compiler bug in g_scanner_cur_value.
* gstrfuncs.c:
Added the function g_strescape, which escapes the backslash
character. Needed especially when printing Windows filenames.
* gtimer.c:
Conditionalized inclusion of unistd.h and sys/time.h. Added
implementations for Windows.
* gutils.c:
Conditionalized inclusion of platform-dependent headers. Use
the platform-independent file name syntax macros.
Conditionalize code on platform-dependent features. Added the
functions g_path_is_absolute g_path_skip_root and g_getenv.
Added the GIOChannel-related functions. Added
compiler-dependent Unix compatibility functions for Windows.
* makefile.lcc makefile.msc:
New files. Compiler-specific makefiles for LCC-Win32 and
Microsoft C. Only Microsoft C is actually supported currently.
* testglib.c:
Added pathname check cases for Windows. Added workaround for
bug in the Microsoft runtime library. Improved some tests a bit.
Tue Oct 27 04:00:11 1998 Tim Janik <timj@gtk.org>
* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
this needs to be more constistent throughout the code, do we go for
NATIVE_WIN32 or WIN32?
* gmodule.c (LibMain): special cased the #ifdef __LCC__ case for
NATIVE_WIN32, since lcc maybe used on other platforms as well.
* libgplugin_a.c (LibMain):
* libgplugin_b.c (LibMain):
likewise. not sure i like this special requirement for lcc in here.
* gmodule-dl.c (_g_module_build_path):
feature empty "" directories and prepend the module name with "lib".
* gmodule-dld.c (_g_module_build_path):
* gmodule-win32.c (_g_module_build_path):
feature empty "" directories.
* we need some more magic in the _g_module_build_path variants
so we don't append/prepend lib and .so, .sl or .dll for those names
that already contain it.
* applied patch from Tor Lillqvist for g_module_build_path() and
windows support.
1998-10-20: Tor Lillqvist <tml@iki.fi>
* gmodule/gmodule-win32.c:
New file.
* gmodule/gmodule.c gmodule/gmodule.h:
Added the funcion g_module_build_path that builds the path to
a module file, decorating the name according to the system's
conventions. Added the Windows implementation.
* gmodule/libgplugin_a.c gmodule/libgplugin_b.c:
Added LibMain for LCC-Win32.
* gmodule/testgmodule.c:
Handle Windows dll names.
1998-10-27 05:11:34 +01:00
|
|
|
|
|
|
|
gchar*
|
|
|
|
g_module_build_path (const gchar *directory,
|
|
|
|
const gchar *module_name)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (module_name != NULL, NULL);
|
|
|
|
|
|
|
|
return _g_module_build_path (directory, module_name);
|
|
|
|
}
|