svn merge ^/branches/released .

7 files changed, 208 insertions, 540 deletions

diff --git a/xorg-server/hw/xfree86/loader/Makefile.am b/xorg-server/hw/xfree86/loader/Makefile.am
index d3c17d173..acacda650 100644
--- a/xorg-server/hw/xfree86/loader/Makefile.am
+++ b/xorg-server/hw/xfree86/loader/Makefile.am
@@ -1,31 +1,29 @@
-noinst_LTLIBRARIES = libloader.la
-
-INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(top_srcdir)/miext/cw \
-	   -I$(srcdir)/../ddc -I$(srcdir)/../i2c -I$(srcdir)/../modes \
-	   -I$(srcdir)/../ramdac
-
-#AM_LDFLAGS = -r
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
-
-EXTRA_DIST = \
-	dlloader.h \
-	loader.h \
-	loaderProcs.h \
-	sdksyms.sh
-
-libloader_la_SOURCES = \
-	loader.c \
-	loaderProcs.h \
-	loadext.c \
-        loadmod.c \
-        dlloader.c \
-	os.c \
-	sdksyms.c
-libloader_la_LIBADD = $(DLOPEN_LIBS)
-
-CLEANFILES = sdksyms.c sdksyms.dep
-
-sdksyms.dep sdksyms.c: sdksyms.sh
-	CPP='$(CPP)' AWK='$(AWK)' $(srcdir)/sdksyms.sh $(top_srcdir) $(AM_CFLAGS) $(CFLAGS) $(INCLUDES)
-
-sinclude sdksyms.dep
+noinst_LTLIBRARIES = libloader.la

+

+INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(top_srcdir)/miext/cw \

+	   -I$(srcdir)/../ddc -I$(srcdir)/../i2c -I$(srcdir)/../modes \

+	   -I$(srcdir)/../ramdac

+

+#AM_LDFLAGS = -r

+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

+

+EXTRA_DIST = \

+	loader.h \

+	loaderProcs.h \

+	sdksyms.sh

+

+libloader_la_SOURCES = \

+	loader.c \

+	loaderProcs.h \

+	loadext.c \

+        loadmod.c \

+	os.c \

+	sdksyms.c

+libloader_la_LIBADD = $(DLOPEN_LIBS)

+

+CLEANFILES = sdksyms.c sdksyms.dep

+

+sdksyms.dep sdksyms.c: sdksyms.sh

+	CPP='$(CPP)' AWK='$(AWK)' $(srcdir)/sdksyms.sh $(top_srcdir) $(AM_CFLAGS) $(CFLAGS) $(INCLUDES)

+

+sinclude sdksyms.dep

diff --git a/xorg-server/hw/xfree86/loader/dlloader.c b/xorg-server/hw/xfree86/loader/dlloader.c
deleted file mode 100644
index 18dcb76c6..000000000
--- a/xorg-server/hw/xfree86/loader/dlloader.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 1997 The XFree86 Project, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of the
- * XFree86 Project, Inc. not be used in advertising or publicity
- * pertaining to distribution of the software without specific,
- * written prior permission.  The Xfree86 Project, Inc. makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * THE XFREE86 PROJECT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL THE XFREE86 PROJECT, INC. BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Once upon a time, X had multiple loader backends, three of which were
- * essentially libdl reimplementations.  This was nonsense so we chucked
- * it, but we still retain the factorization between loader API and
- * platform implementation.  This file is the libdl implementation, and
- * currently the only backend.  If you find yourself porting to a platform
- * without working libdl - hpux, win32, some forsaken a.out host, etc. -
- * make a new backend rather than hacking up this file.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <dlfcn.h>
-
-#include <X11/Xos.h>
-#include "os.h"
-
-#include "loader.h"
-#include "dlloader.h"
-
-#if defined(DL_LAZY)
-#define DLOPEN_LAZY DL_LAZY
-#elif defined(RTLD_LAZY)
-#define DLOPEN_LAZY RTLD_LAZY
-#elif defined(__FreeBSD__)
-#define DLOPEN_LAZY 1
-#else
-#define DLOPEN_LAZY 0
-#endif
-
-#if defined(LD_GLOBAL)
-#define DLOPEN_GLOBAL LD_GLOBAL
-#elif defined(RTLD_GLOBAL)
-#define DLOPEN_GLOBAL RTLD_GLOBAL
-#else
-#define DLOPEN_GLOBAL 0
-#endif
-
-#if defined(CSRG_BASED) && !defined(__ELF__)
-#define DLSYM_PREFIX "_"
-#else
-#define DLSYM_PREFIX ""
-#endif
-
-/* Hooray, yet another open coded linked list! FIXME */
-typedef struct DLModuleList {
-    void *module;
-    struct DLModuleList *next;
-} DLModuleList;
-
-static DLModuleList *dlModuleList = NULL;
-
-static void *
-DLFindSymbolLocal(pointer module, const char *name)
-{
-    void *p;
-    char *n;
-
-    static const char symPrefix[] = DLSYM_PREFIX;
-
-    if (sizeof(symPrefix) > 1) {
-	n = malloc(strlen(symPrefix) + strlen(name) + 1);
-	sprintf(n, "%s%s", symPrefix, name);
-	name = n;
-    }
-
-    p = dlsym(module, name);
-
-    if (sizeof(symPrefix) > 1)
-	free(n);
-
-    return p;
-}
-
-static void *global_scope = NULL;
-
-void *
-DLFindSymbol(const char *name)
-{
-    DLModuleList *l;
-    void *p;
-
-    p = dlsym(RTLD_DEFAULT, name);
-    if (p != NULL)
-	return p;
-
-    for (l = dlModuleList; l != NULL; l = l->next) {
-        p = DLFindSymbolLocal(l->module, name);
-	if (p)
-	    return p;
-    }
-
-    if (!global_scope)
-	global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL);
-
-    if (global_scope)
-	return DLFindSymbolLocal(global_scope, name);
-
-    return NULL;
-}
-
-void *
-DLLoadModule(loaderPtr modrec, int flags)
-{
-    void * dlfile;
-    DLModuleList *l;
-    int dlopen_flags;
-
-    if (flags & LD_FLAG_GLOBAL)
-	dlopen_flags = DLOPEN_LAZY | DLOPEN_GLOBAL;
-    else
-	dlopen_flags = DLOPEN_LAZY;
-    dlfile = dlopen(modrec->name, dlopen_flags);
-    if (dlfile == NULL) {
-	ErrorF("dlopen: %s\n", dlerror());
-	return NULL;
-    }
-
-    l = malloc(sizeof(DLModuleList));
-    l->module = dlfile;
-    l->next = dlModuleList;
-    dlModuleList = l;
-
-    return (void *)dlfile;
-}
-
-void
-DLUnloadModule(void *modptr)
-{
-    DLModuleList *l, *p;
-
-    /* remove it from dlModuleList. */
-    if (dlModuleList->module == modptr) {
-	l = dlModuleList;
-	dlModuleList = l->next;
-	free(l);
-    } else {
-	p = dlModuleList;
-	for (l = dlModuleList->next; l != NULL; l = l->next) {
-	    if (l->module == modptr) {
-		p->next = l->next;
-		free(l);
-		break;
-	    }
-	    p = l;
-	}
-    }
-    dlclose(modptr);
-}
diff --git a/xorg-server/hw/xfree86/loader/dlloader.h b/xorg-server/hw/xfree86/loader/dlloader.h
deleted file mode 100644
index 8ae610f02..000000000
--- a/xorg-server/hw/xfree86/loader/dlloader.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 1997 Metro Link, Inc.
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Metro Link, Inc. not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Metro Link, Inc. makes no
- * representations about the suitability of this software for any purpose.
- *  It is provided "as is" without express or implied warranty.
- *
- * METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#ifndef _DLLOADER_H
-#define _DLLOADER_H
-
-extern void *DLLoadModule(loaderPtr, int flags);
-extern void DLUnloadModule(void *);
-extern void *DLFindSymbol(const char *name);
-
-#endif
diff --git a/xorg-server/hw/xfree86/loader/loader.c b/xorg-server/hw/xfree86/loader/loader.c
index 7ea934a89..32c4431de 100644
--- a/xorg-server/hw/xfree86/loader/loader.c
+++ b/xorg-server/hw/xfree86/loader/loader.c
@@ -54,18 +54,10 @@
 #include <stdio.h>

 #include <stdlib.h>

 #include <sys/types.h>

-#if defined(UseMMAP) || (defined(linux) && defined(__ia64__))

-#include <sys/mman.h>

-#endif

 #include <unistd.h>

 #include <sys/stat.h>

 #include <fcntl.h>

 #include <string.h>

-#if defined(linux) && \

-    (defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \

-    || defined(__amd64__))

-#include <malloc.h>

-#endif

 #include <stdarg.h>

 

 #include "os.h"

@@ -75,44 +67,34 @@
 #include "xf86Priv.h"

 #include "compiler.h"

 

-extern void *xorg_symbols[];

-

-#define MAX_HANDLE 256

-static int refCount[MAX_HANDLE];

-

-static int moduleseq = 0;

-

-/* Prototypes for static functions. */

-static loaderPtr listHead = NULL;

+#ifdef HAVE_DLFCN_H

 

-static loaderPtr

-_LoaderListPush(void)

-{

-    loaderPtr item = calloc(1, sizeof(struct _loader));

-

-    item->next = listHead;

-    listHead = item;

+#include <dlfcn.h>

+#include <X11/Xos.h>

 

-    return item;

-}

+#if defined(DL_LAZY)

+#define DLOPEN_LAZY DL_LAZY

+#elif defined(RTLD_LAZY)

+#define DLOPEN_LAZY RTLD_LAZY

+#elif defined(__FreeBSD__)

+#define DLOPEN_LAZY 1

+#else

+#define DLOPEN_LAZY 0

+#endif

 

-static loaderPtr

-_LoaderListPop(int handle)

-{

-    loaderPtr item = listHead;

-    loaderPtr *bptr = &listHead;	/* pointer to previous node */

+#if defined(LD_GLOBAL)

+#define DLOPEN_GLOBAL LD_GLOBAL

+#elif defined(RTLD_GLOBAL)

+#define DLOPEN_GLOBAL RTLD_GLOBAL

+#else

+#define DLOPEN_GLOBAL 0

+#endif

 

-    while (item) {

-	if (item->handle == handle) {

-	    *bptr = item->next;	/* remove this from the list */

-	    return item;

-	}

-	bptr = &(item->next);

-	item = item->next;

-    }

+#else

+#error i have no dynamic linker and i must scream

+#endif

 

-    return 0;

-}

+extern void *xorg_symbols[];

 

 void

 LoaderInit(void)

@@ -149,134 +131,60 @@ LoaderInit(void)
 	    path = uwcrtpath; /* fallback: try to get libcrt.a from the uccs */

 	else

 	    path = xcrtpath; /* get the libcrt.a we compiled with */

-	LoaderOpen (path, "libcrt", 0, &errmaj, &errmin, &wasLoaded);

+	LoaderOpen (path, &errmaj, &errmin, &wasLoaded, 0);

     }

 #endif

 }

 

 /* Public Interface to the loader. */

 

-int

-LoaderOpen(const char *module, const char *cname, int handle,

-	   int *errmaj, int *errmin, int *wasLoaded, int flags)

+void *

+LoaderOpen(const char *module, int *errmaj, int *errmin)

 {

-    loaderPtr tmp;

-    int new_handle;

+    void *ret;

 

 #if defined(DEBUG)

     ErrorF("LoaderOpen(%s)\n", module);

 #endif

 

-    /* Is the module already loaded? */

-    if (handle >= 0) {

-	tmp = listHead;

-	while (tmp) {

-#ifdef DEBUGLIST

-	    ErrorF("strcmp(%x(%s),{%x} %x(%s))\n", module, module,

-		   &(tmp->name), tmp->name, tmp->name);

-#endif

-	    if (!strcmp(module, tmp->name)) {

-		refCount[tmp->handle]++;

-		if (wasLoaded)

-		    *wasLoaded = 1;

-		xf86MsgVerb(X_INFO, 2, "Reloading %s\n", module);

-		return tmp->handle;

-	    }

-	    tmp = tmp->next;

-	}

-    }

-

-    /*

-     * OK, it's a new one. Add it.

-     */

     xf86Msg(X_INFO, "Loading %s\n", module);

-    if (wasLoaded)

-	*wasLoaded = 0;

 

-    /*

-     * Find a free handle.

-     */

-    new_handle = 1;

-    while (new_handle < MAX_HANDLE && refCount[new_handle])

-	new_handle++;

-

-    if (new_handle == MAX_HANDLE) {

-	xf86Msg(X_ERROR, "Out of loader space\n");	/* XXX */

-	if (errmaj)

-	    *errmaj = LDR_NOSPACE;

-	if (errmin)

-	    *errmin = LDR_NOSPACE;

-	return -1;

-    }

-

-    refCount[new_handle] = 1;

-

-    tmp = _LoaderListPush();

-    tmp->name = strdup(module);

-    tmp->cname = strdup(cname);

-    tmp->handle = new_handle;

-    tmp->module = moduleseq++;

-

-    if ((tmp->private = DLLoadModule(tmp, flags)) == NULL) {

-	xf86Msg(X_ERROR, "Failed to load %s\n", module);

-	_LoaderListPop(new_handle);

-	refCount[new_handle] = 0;

+    if (!(ret = dlopen(module, DLOPEN_LAZY | DLOPEN_GLOBAL))) {

+	xf86Msg(X_ERROR, "Failed to load %s: %s\n", module, dlerror());

 	if (errmaj)

 	    *errmaj = LDR_NOLOAD;

 	if (errmin)

 	    *errmin = LDR_NOLOAD;

-	return -1;

+	return NULL;

     }

 

-    return new_handle;

-}

-

-int

-LoaderHandleOpen(int handle)

-{

-    if (handle < 0 || handle >= MAX_HANDLE)

-	return -1;

-

-    if (!refCount[handle])

-	return -1;

-

-    refCount[handle]++;

-    return handle;

+    return ret;

 }

 

 void *

-LoaderSymbol(const char *sym)

+LoaderSymbol(const char *name)

 {

-    return (DLFindSymbol(sym));

-}

+    static void *global_scope = NULL;

+    void *p;

 

-int

-LoaderUnload(int handle)

-{

-    loaderRec fakeHead;

-    loaderPtr tmp = &fakeHead;

+    p = dlsym(RTLD_DEFAULT, name);

+    if (p != NULL)

+	return p;

 

-    if (handle < 0 || handle >= MAX_HANDLE)

-	return -1;

+    if (!global_scope)

+	global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL);

 

-    /*

-     * check the reference count, only free it if it goes to zero

-     */

-    if (--refCount[handle])

-	return 0;

-    /*

-     * find the loaderRecs associated with this handle.

-     */

+    if (global_scope)

+	return dlsym(global_scope, name);

 

-    while ((tmp = _LoaderListPop(handle)) != NULL) {

-	xf86Msg(X_INFO, "Unloading %s\n", tmp->name);

-	DLUnloadModule(tmp->private);

-	free(tmp->name);

-	free(tmp->cname);

-	free(tmp);

-    }

+    return NULL;

+}

 

-    return 0;

+void

+LoaderUnload(const char *name, void *handle)

+{

+    xf86Msg(X_INFO, "Unloading %s\n", name);

+    dlclose(handle);

 }

 

 unsigned long LoaderOptions = 0;

diff --git a/xorg-server/hw/xfree86/loader/loader.h b/xorg-server/hw/xfree86/loader/loader.h
index 77267f847..a53970b6e 100644
--- a/xorg-server/hw/xfree86/loader/loader.h
+++ b/xorg-server/hw/xfree86/loader/loader.h
@@ -57,23 +57,6 @@
 #include <X11/Xfuncproto.h>

 #include <X11/Xmd.h>

 

-/* LoadModule proc flags; LD_FLAG_GLOBAL adds symbols to global

- * namespace, default is to keep symbols local to module. */

-#define LD_FLAG_GLOBAL 1

-

-typedef struct _loader *loaderPtr;

-

-/* Each module loaded has a loaderRec */

-typedef struct _loader {

-    int handle;			/* Unique id used to remove symbols from

-				 * this module when it is unloaded */

-    int module;			/* Unique id to identify compilation units */

-    char *name;

-    char *cname;

-    void *private;		/* format specific data */

-    loaderPtr next;

-} loaderRec;

-

 /* Compiled-in version information */

 typedef struct {

     int xf86Version;

@@ -88,10 +71,6 @@ extern const ModuleVersions LoaderVersionInfo;
 extern unsigned long LoaderOptions;

 

 /* Internal Functions */

-int LoaderOpen(const char *, const char *, int, int *, int *, int *, int);

-int LoaderHandleOpen(int);

-

-/* Loader backends. */

-#include "dlloader.h"

+void * LoaderOpen(const char *, int *, int *);

 

 #endif /* _LOADER_H */

diff --git a/xorg-server/hw/xfree86/loader/loaderProcs.h b/xorg-server/hw/xfree86/loader/loaderProcs.h
index a7925ecee..133d5aae9 100644
--- a/xorg-server/hw/xfree86/loader/loaderProcs.h
+++ b/xorg-server/hw/xfree86/loader/loaderProcs.h
@@ -1,93 +1,94 @@
-/*
- * Copyright 1995-1998 by Metro Link, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Metro Link, Inc. not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Metro Link, Inc. makes no
- * representations about the suitability of this software for any purpose.
- *  It is provided "as is" without express or implied warranty.
- *
- * METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-/*
- * Copyright (c) 1997-2002 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#ifndef _LOADERPROCS_H
-#define _LOADERPROCS_H
-
-#include "xf86Module.h"
-
-typedef struct module_desc {
-    struct module_desc *child;
-    struct module_desc *sib;
-    struct module_desc *parent;
-    char *name;
-    int handle;
-    ModuleSetupProc SetupProc;
-    ModuleTearDownProc TearDownProc;
-    void *TearDownData;		/* returned from SetupProc */
-    const XF86ModuleVersionInfo *VersionInfo;
-} ModuleDesc, *ModuleDescPtr;
-
-/* External API for the loader */
-
-void LoaderInit(void);
-
-ModuleDescPtr LoadDriver(const char *, const char *, int, pointer, int *,
-			 int *);
-ModuleDescPtr LoadModule(const char *, const char *, const char **,
-			 const char **, pointer, const XF86ModReqInfo *,
-			 int *, int *);
-ModuleDescPtr DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent);
-void UnloadDriver(ModuleDescPtr);
-void LoaderSetPath(const char *path);
-void LoaderSortExtensions(void);
-
-int LoaderUnload(int);
-unsigned long LoaderGetModuleVersion(ModuleDescPtr mod);
-
-void LoaderResetOptions(void);
-void LoaderSetOptions(unsigned long);
-
-/* Options for LoaderSetOptions */
-#define LDR_OPT_ABI_MISMATCH_NONFATAL		0x0001
-
-#endif /* _LOADERPROCS_H */
+/*

+ * Copyright 1995-1998 by Metro Link, Inc.

+ *

+ * Permission to use, copy, modify, distribute, and sell this software and its

+ * documentation for any purpose is hereby granted without fee, provided that

+ * the above copyright notice appear in all copies and that both that

+ * copyright notice and this permission notice appear in supporting

+ * documentation, and that the name of Metro Link, Inc. not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  Metro Link, Inc. makes no

+ * representations about the suitability of this software for any purpose.

+ *  It is provided "as is" without express or implied warranty.

+ *

+ * METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+ * PERFORMANCE OF THIS SOFTWARE.

+ */

+/*

+ * Copyright (c) 1997-2002 by The XFree86 Project, Inc.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+ * OTHER DEALINGS IN THE SOFTWARE.

+ *

+ * Except as contained in this notice, the name of the copyright holder(s)

+ * and author(s) shall not be used in advertising or otherwise to promote

+ * the sale, use or other dealings in this Software without prior written

+ * authorization from the copyright holder(s) and author(s).

+ */

+

+#ifdef HAVE_XORG_CONFIG_H

+#include <xorg-config.h>

+#endif

+

+#ifndef _LOADERPROCS_H

+#define _LOADERPROCS_H

+

+#include "xf86Module.h"

+

+typedef struct module_desc {

+    struct module_desc *child;

+    struct module_desc *sib;

+    struct module_desc *parent;

+    char *name;

+    char *path;

+    void *handle;

+    ModuleSetupProc SetupProc;

+    ModuleTearDownProc TearDownProc;

+    void *TearDownData;		/* returned from SetupProc */

+    const XF86ModuleVersionInfo *VersionInfo;

+} ModuleDesc, *ModuleDescPtr;

+

+/* External API for the loader */

+

+void LoaderInit(void);

+

+ModuleDescPtr LoadDriver(const char *, const char *, int, pointer, int *,

+			 int *);

+ModuleDescPtr LoadModule(const char *, const char *, const char **,

+			 const char **, pointer, const XF86ModReqInfo *,

+			 int *, int *);

+ModuleDescPtr DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent);

+void UnloadDriver(ModuleDescPtr);

+void LoaderSetPath(const char *path);

+void LoaderSortExtensions(void);

+

+void LoaderUnload(const char *, void *);

+unsigned long LoaderGetModuleVersion(ModuleDescPtr mod);

+

+void LoaderResetOptions(void);

+void LoaderSetOptions(unsigned long);

+

+/* Options for LoaderSetOptions */

+#define LDR_OPT_ABI_MISMATCH_NONFATAL		0x0001

+

+#endif /* _LOADERPROCS_H */

diff --git a/xorg-server/hw/xfree86/loader/loadmod.c b/xorg-server/hw/xfree86/loader/loadmod.c
index 82739e46e..395cdf104 100644
--- a/xorg-server/hw/xfree86/loader/loadmod.c
+++ b/xorg-server/hw/xfree86/loader/loadmod.c
@@ -83,8 +83,7 @@ static char *LoaderGetCanonicalName(const char *, PatternPtr);
 static void RemoveChild(ModuleDescPtr);

 static ModuleDescPtr doLoadModule(const char *, const char *, const char **,

 				  const char **, pointer,

-				  const XF86ModReqInfo *, int *, int *,

-				  int flags);

+				  const XF86ModReqInfo *, int *, int *);

 

 const ModuleVersions LoaderVersionInfo = {

     XORG_VERSION_CURRENT,

@@ -765,7 +764,7 @@ LoadSubModule(pointer _parent, const char *module,
     }

 

     submod = doLoadModule(module, NULL, subdirlist, patternlist, options,

-			  modreq, errmaj, errmin, LD_FLAG_GLOBAL);

+			  modreq, errmaj, errmin);

     if (submod && submod != (ModuleDescPtr) 1) {

 	parent->child = AddSibling(parent->child, submod);

 	submod->parent = parent;

@@ -776,18 +775,10 @@ LoadSubModule(pointer _parent, const char *module,
 static ModuleDescPtr

 NewModuleDesc(const char *name)

 {

-    ModuleDescPtr mdp = malloc(sizeof(ModuleDesc));

+    ModuleDescPtr mdp = calloc(1, sizeof(ModuleDesc));

 

-    if (mdp) {

-	mdp->child = NULL;

-	mdp->sib = NULL;

-	mdp->parent = NULL;

+    if (mdp)

 	mdp->name = xstrdup(name);

-	mdp->handle = -1;

-	mdp->SetupProc = NULL;

-	mdp->TearDownProc = NULL;

-	mdp->TearDownData = NULL;

-    }

 

     return mdp;

 }

@@ -796,6 +787,7 @@ ModuleDescPtr
 DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent)

 {

     ModuleDescPtr ret;

+    int errmaj, errmin;

 

     if (!mod)

 	return NULL;

@@ -804,10 +796,11 @@ DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent)
     if (ret == NULL)

 	return NULL;

 

-    if (LoaderHandleOpen(mod->handle) == -1)

-	return NULL;

+    if (!(ret->handle = LoaderOpen(mod->path, &errmaj, &errmin))) {

+        free(ret);

+        return NULL;

+    }

 

-    ret->handle = mod->handle;

     ret->SetupProc = mod->SetupProc;

     ret->TearDownProc = mod->TearDownProc;

     ret->TearDownData = NULL;

@@ -815,6 +808,7 @@ DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent)
     ret->sib = DuplicateModule(mod->sib, parent);

     ret->parent = parent;

     ret->VersionInfo = mod->VersionInfo;

+    ret->path = strdup(mod->path);

 

     return ret;

 }

@@ -830,7 +824,7 @@ static ModuleDescPtr
 doLoadModule(const char *module, const char *path, const char **subdirlist,

 	     const char **patternlist, pointer options,

 	     const XF86ModReqInfo * modreq,

-	     int *errmaj, int *errmin, int flags)

+	     int *errmaj, int *errmin)

 {

     XF86ModuleData *initdata = NULL;

     char **pathlist = NULL;

@@ -839,7 +833,6 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
     char **path_elem = NULL;

     char *p = NULL;

     ModuleDescPtr ret = NULL;

-    int wasLoaded = 0;

     PatternPtr patterns = NULL;

     int noncanonical = 0;

     char *m = NULL;

@@ -926,10 +919,10 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
 	    *errmin = 0;

 	goto LoadModule_fail;

     }

-    ret->handle = LoaderOpen(found, name, 0,

-			     errmaj, errmin, &wasLoaded, flags);

+    ret->handle = LoaderOpen(found, errmaj, errmin);

     if (ret->handle < 0)

 	goto LoadModule_fail;

+    ret->path = strdup(found);

 

     /* drop any explicit suffix from the module name */

     p = strchr(name, '.');

@@ -960,26 +953,24 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
 	setup = initdata->setup;

 	teardown = initdata->teardown;

 

-	if (!wasLoaded) {

-	    if (vers) {

-		if (!CheckVersion(module, vers, modreq)) {

-		    if (errmaj)

-			*errmaj = LDR_MISMATCH;

-		    if (errmin)

-			*errmin = 0;

-		    goto LoadModule_fail;

-		}

-	    } else {

-		xf86Msg(X_ERROR,

-			"LoadModule: Module %s does not supply"

-			" version information\n", module);

-		if (errmaj)

-		    *errmaj = LDR_INVALID;

-		if (errmin)

-		    *errmin = 0;

-		goto LoadModule_fail;

-	    }

-	}

+        if (vers) {

+            if (!CheckVersion(module, vers, modreq)) {

+                if (errmaj)

+                    *errmaj = LDR_MISMATCH;

+                if (errmin)

+                    *errmin = 0;

+                goto LoadModule_fail;

+            }

+        } else {

+            xf86Msg(X_ERROR,

+                    "LoadModule: Module %s does not supply"

+                    " version information\n", module);

+            if (errmaj)

+                *errmaj = LDR_INVALID;

+            if (errmin)

+                *errmin = 0;

+            goto LoadModule_fail;

+        }

 	if (setup)

 	    ret->SetupProc = setup;

 	if (teardown)

@@ -1067,7 +1058,7 @@ LoadModule(const char *module, const char *path, const char **subdirlist,
 	   const XF86ModReqInfo * modreq, int *errmaj, int *errmin)

 {

   return doLoadModule(module, path, subdirlist, patternlist, options,

-		      modreq, errmaj, errmin, LD_FLAG_GLOBAL);

+		      modreq, errmaj, errmin);

 }

 

 void

@@ -1089,12 +1080,13 @@ UnloadModuleOrDriver(ModuleDescPtr mod)
 

     if ((mod->TearDownProc) && (mod->TearDownData))

 	mod->TearDownProc(mod->TearDownData);

-    LoaderUnload(mod->handle);

+    LoaderUnload(mod->name, mod->handle);

 

     if (mod->child)

 	UnloadModuleOrDriver(mod->child);

     if (mod->sib)

 	UnloadModuleOrDriver(mod->sib);

+    free(mod->path);

     free(mod->name);

     free(mod);

 }

@@ -1111,13 +1103,14 @@ UnloadSubModule(pointer _mod)
 

     if ((mod->TearDownProc) && (mod->TearDownData))

 	mod->TearDownProc(mod->TearDownData);

-    LoaderUnload(mod->handle);

+    LoaderUnload(mod->name, mod->handle);

 

     RemoveChild(mod);

 

     if (mod->child)

 	UnloadModuleOrDriver(mod->child);

 

+    free(mod->path);

     free(mod->name);

     free(mod);

 }