1 files changed, 286 insertions, 272 deletions

diff --git a/hw/xfree86/loader/loadext.c b/hw/xfree86/loader/loadext.c
index 206c8296a..ffc98b243 100644
--- a/hw/xfree86/loader/loadext.c
+++ b/hw/xfree86/loader/loadext.c
@@ -1,6 +1,30 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loadext.c,v 1.6 2000/02/08 17:19:19 dawes Exp $ */
-
-/* Copyright 2000 by The XFree86 Project, Inc */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loadext.c,v 1.8 2003/10/15 16:29:04 dawes Exp $ */
+/*
+ * Copyright (c) 2000 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).
+ */
 
 /* Maybe this file belongs elsewhere? */
 
@@ -12,58 +36,56 @@
 ExtensionModule *ExtensionModuleList = NULL;
 static int numExtensionModules = 0;
 
-
 static ExtensionModule *
 NewExtensionModule(void)
 {
-	ExtensionModule *save = ExtensionModuleList;
-	int n;
-
-	/* Sanity check */
-	if (!ExtensionModuleList)
-		numExtensionModules = 0;
-
-	n = numExtensionModules + 1;
-	ExtensionModuleList = xrealloc(ExtensionModuleList,
-				       (n + 1) * sizeof(ExtensionModule));
-	if (ExtensionModuleList == NULL) {
-		ExtensionModuleList = save;
-		return NULL;
-	} else {
-		numExtensionModules++;
-		ExtensionModuleList[numExtensionModules].name = NULL;
-		return ExtensionModuleList + (numExtensionModules - 1);
-	}
+    ExtensionModule *save = ExtensionModuleList;
+    int n;
+
+    /* Sanity check */
+    if (!ExtensionModuleList)
+	numExtensionModules = 0;
+
+    n = numExtensionModules + 1;
+    ExtensionModuleList = xrealloc(ExtensionModuleList,
+				   (n + 1) * sizeof(ExtensionModule));
+    if (ExtensionModuleList == NULL) {
+	ExtensionModuleList = save;
+	return NULL;
+    } else {
+	numExtensionModules++;
+	ExtensionModuleList[numExtensionModules].name = NULL;
+	return ExtensionModuleList + (numExtensionModules - 1);
+    }
 }
 
 void
-LoadExtension(ExtensionModule *e, Bool builtin)
+LoadExtension(ExtensionModule * e, Bool builtin)
 {
-	ExtensionModule *newext;
+    ExtensionModule *newext;
 
-	if (e == NULL || e->name == NULL)
-		return;
+    if (e == NULL || e->name == NULL)
+	return;
 
-	if (!(newext = NewExtensionModule()))
-		return;
+    if (!(newext = NewExtensionModule()))
+	return;
 
-	if (builtin)
-		xf86MsgVerb(X_INFO, 2, "Initializing built-in extension %s\n",
-				e->name);
-	else
-		xf86MsgVerb(X_INFO, 2, "Loading extension %s\n", e->name);
+    if (builtin)
+	xf86MsgVerb(X_INFO, 2, "Initializing built-in extension %s\n",
+		    e->name);
+    else
+	xf86MsgVerb(X_INFO, 2, "Loading extension %s\n", e->name);
 
-	newext->name = e->name;
-	newext->initFunc = e->initFunc;
-	newext->disablePtr = e->disablePtr;
-	newext->setupFunc = e->setupFunc;
-	newext->initDependencies = e->initDependencies;
+    newext->name = e->name;
+    newext->initFunc = e->initFunc;
+    newext->disablePtr = e->disablePtr;
+    newext->setupFunc = e->setupFunc;
+    newext->initDependencies = e->initDependencies;
 
-	if (e->setupFunc != NULL)
-		e->setupFunc();
+    if (e->setupFunc != NULL)
+	e->setupFunc();
 }
 
-
 /*
  * Sort ExtensionModuleList according to the initialisation order
  * dependencies.  The code for this is taken from BSD's tsort,
@@ -105,21 +127,20 @@ LoadExtension(ExtensionModule *e, Bool builtin)
  * SUCH DAMAGE.
  */
 
-
-#define	NF_MARK		0x1		/* marker for cycle detection */
-#define	NF_ACYCLIC	0x2		/* this node is cycle free */
-#define	NF_NODEST	0x4		/* Unreachable */
+#define	NF_MARK		0x1	/* marker for cycle detection */
+#define	NF_ACYCLIC	0x2	/* this node is cycle free */
+#define	NF_NODEST	0x4	/* Unreachable */
 
 typedef struct node_str NODE;
 struct node_str {
-	NODE **n_prevp;			/* pointer to previous node's n_next */
-	NODE *n_next;			/* next node in graph */
-	NODE **n_arcs;			/* array of arcs to other nodes */
-	int n_narcs;			/* number of arcs in n_arcs[] */
-	int n_arcsize;			/* size of n_arcs[] array */
-	int n_refcnt;			/* # of arcs pointing to this node */
-	int n_flags;			/* NF_* */
-	const char *n_name;		/* name of this node */
+    NODE **n_prevp;		/* pointer to previous node's n_next */
+    NODE *n_next;		/* next node in graph */
+    NODE **n_arcs;		/* array of arcs to other nodes */
+    int n_narcs;		/* number of arcs in n_arcs[] */
+    int n_arcsize;		/* size of n_arcs[] array */
+    int n_refcnt;		/* # of arcs pointing to this node */
+    int n_flags;		/* NF_* */
+    const char *n_name;		/* name of this node */
 };
 
 static NODE *graph = NULL, **cycle_buf = NULL, **longest_cycle = NULL;
@@ -130,32 +151,31 @@ static NODE *sorted = NULL, *last = NULL;
 static NODE *
 get_node(const char *name)
 {
-	NODE *n;
+    NODE *n;
 
-	for (n = graph; n && n->n_name && strcmp(n->n_name, name); n = n->n_next)
-		;
-	if (n)
-		return (n);
+    for (n = graph; n && n->n_name && strcmp(n->n_name, name);
+	 n = n->n_next) ;
+    if (n)
+	return (n);
 
-	n = xnfalloc(sizeof(NODE));
+    n = xnfalloc(sizeof(NODE));
 
-	n->n_narcs = 0;
-	n->n_arcsize = 0;
-	n->n_arcs = NULL;
-	n->n_refcnt = 0;
-	n->n_flags = 0;
-	n->n_name = name;
+    n->n_narcs = 0;
+    n->n_arcsize = 0;
+    n->n_arcs = NULL;
+    n->n_refcnt = 0;
+    n->n_flags = 0;
+    n->n_name = name;
 
-	/* Add to linked list. */
-	if ((n->n_next = graph) != NULL)
-		graph->n_prevp = &n->n_next;
-	n->n_prevp = &graph;
-	graph = n;
+    /* Add to linked list. */
+    if ((n->n_next = graph) != NULL)
+	graph->n_prevp = &n->n_next;
+    n->n_prevp = &graph;
+    graph = n;
 
-	return (n);
+    return (n);
 }
 
-
 /*
  * add an arc from node s1 to node s2 in the graph.  If s1 or s2 are not in
  * the graph, then add them.
@@ -163,35 +183,35 @@ get_node(const char *name)
 static void
 add_arc(const char *s1, const char *s2)
 {
-	NODE *n1;
-	NODE *n2;
-	int bsize, i;
-
-	n1 = get_node(s1);
-
-	if (!strcmp(s1, s2))
-		return;
-
-	n2 = get_node(s2);
-
-	/*
-	 * Check if this arc is already here.
-	 */
-	for (i = 0; i < n1->n_narcs; i++)
-		if (n1->n_arcs[i] == n2)
-			return;
-	/*
-	 * Add it.
-	 */
-	if (n1->n_narcs == n1->n_arcsize) {
-		if (!n1->n_arcsize)
-			n1->n_arcsize = 10;
-		bsize = n1->n_arcsize * sizeof(*n1->n_arcs) * 2;
-		n1->n_arcs = xnfrealloc(n1->n_arcs, bsize);
-		n1->n_arcsize = bsize / sizeof(*n1->n_arcs);
-	}
-	n1->n_arcs[n1->n_narcs++] = n2;
-	++n2->n_refcnt;
+    NODE *n1;
+    NODE *n2;
+    int bsize, i;
+
+    n1 = get_node(s1);
+
+    if (!strcmp(s1, s2))
+	return;
+
+    n2 = get_node(s2);
+
+    /*
+     * Check if this arc is already here.
+     */
+    for (i = 0; i < n1->n_narcs; i++)
+	if (n1->n_arcs[i] == n2)
+	    return;
+    /*
+     * Add it.
+     */
+    if (n1->n_narcs == n1->n_arcsize) {
+	if (!n1->n_arcsize)
+	    n1->n_arcsize = 10;
+	bsize = n1->n_arcsize * sizeof(*n1->n_arcs) * 2;
+	n1->n_arcs = xnfrealloc(n1->n_arcs, bsize);
+	n1->n_arcsize = bsize / sizeof(*n1->n_arcs);
+    }
+    n1->n_arcs[n1->n_narcs++] = n2;
+    ++n2->n_refcnt;
 }
 
 /*
@@ -200,220 +220,214 @@ add_arc(const char *s1, const char *s2)
 static void
 clear_cycle(void)
 {
-	NODE *n;
+    NODE *n;
 
-	for (n = graph; n != NULL; n = n->n_next)
-		n->n_flags &= ~NF_NODEST;
+    for (n = graph; n != NULL; n = n->n_next)
+	n->n_flags &= ~NF_NODEST;
 }
 
 /* print node and remove from graph (does not actually free node) */
 static void
-remove_node(NODE *n)
+remove_node(NODE * n)
 {
-	NODE **np;
-	NODE *newnode;
-	int i;
+    NODE **np;
+    NODE *newnode;
+    int i;
 
 #ifdef DEBUG
-	ErrorF("%s\n", n->n_name);
+    ErrorF("%s\n", n->n_name);
 #endif
-	newnode = xnfalloc(sizeof(NODE));
-	memcpy(newnode, n, sizeof(NODE));
-	if (last)
-		last->n_next = newnode;
-	else
-		sorted = newnode;
-	last = newnode;
-	newnode->n_next = NULL;
-
-	for (np = n->n_arcs, i = n->n_narcs; --i >= 0; np++)
-		--(*np)->n_refcnt;
-	n->n_narcs = 0;
-	*n->n_prevp = n->n_next;
-	if (n->n_next)
-		n->n_next->n_prevp = n->n_prevp;
+    newnode = xnfalloc(sizeof(NODE));
+    memcpy(newnode, n, sizeof(NODE));
+    if (last)
+	last->n_next = newnode;
+    else
+	sorted = newnode;
+    last = newnode;
+    newnode->n_next = NULL;
+
+    for (np = n->n_arcs, i = n->n_narcs; --i >= 0; np++)
+	--(*np)->n_refcnt;
+    n->n_narcs = 0;
+    *n->n_prevp = n->n_next;
+    if (n->n_next)
+	n->n_next->n_prevp = n->n_prevp;
 }
 
-
 static void
-free_nodes(NODE *nodelist)
+free_nodes(NODE * nodelist)
 {
-	NODE *n, *nextnode;
+    NODE *n, *nextnode;
 
-	for (n = nodelist; n;) {
-		nextnode = n->n_next;
-		xfree(n);
-		n = nextnode;
-	}
+    for (n = nodelist; n;) {
+	nextnode = n->n_next;
+	xfree(n);
+	n = nextnode;
+    }
 }
 
-
 /* look for the longest? cycle from node from to node to. */
 static int
-find_cycle(NODE *from, NODE *to, int longest_len, int depth)
+find_cycle(NODE * from, NODE * to, int longest_len, int depth)
 {
-	NODE **np;
-	int i, len;
-
-	/*
-	 * avoid infinite loops and ignore portions of the graph known
-	 * to be acyclic
-	 */
-	if (from->n_flags & (NF_NODEST|NF_MARK|NF_ACYCLIC))
-		return (0);
-	from->n_flags |= NF_MARK;
-
-	for (np = from->n_arcs, i = from->n_narcs; --i >= 0; np++) {
-		cycle_buf[depth] = *np;
-		if (*np == to) {
-			if (depth + 1 > longest_len) {
-				longest_len = depth + 1;
-				memcpy((char *)longest_cycle,
-				    (char *)cycle_buf,
-				    longest_len * sizeof(NODE *));
-			}
-		} else {
-			if ((*np)->n_flags & (NF_MARK|NF_ACYCLIC|NF_NODEST))
-				continue;
-			len = find_cycle(*np, to, longest_len, depth + 1);
+    NODE **np;
+    int i, len;
+
+    /*
+     * avoid infinite loops and ignore portions of the graph known
+     * to be acyclic
+     */
+    if (from->n_flags & (NF_NODEST | NF_MARK | NF_ACYCLIC))
+	return (0);
+    from->n_flags |= NF_MARK;
+
+    for (np = from->n_arcs, i = from->n_narcs; --i >= 0; np++) {
+	cycle_buf[depth] = *np;
+	if (*np == to) {
+	    if (depth + 1 > longest_len) {
+		longest_len = depth + 1;
+		memcpy((char *)longest_cycle,
+		       (char *)cycle_buf, longest_len * sizeof(NODE *));
+	    }
+	} else {
+	    if ((*np)->n_flags & (NF_MARK | NF_ACYCLIC | NF_NODEST))
+		continue;
+	    len = find_cycle(*np, to, longest_len, depth + 1);
 
 #ifdef DEBUG
-			ErrorF("%*s %s->%s %d\n", depth, "",
-			    from->n_name, to->n_name, len);
+	    ErrorF("%*s %s->%s %d\n", depth, "",
+		   from->n_name, to->n_name, len);
 #endif
 
-			if (len == 0)
-				(*np)->n_flags |= NF_NODEST;
+	    if (len == 0)
+		(*np)->n_flags |= NF_NODEST;
 
-			if (len > longest_len)
-				longest_len = len;
+	    if (len > longest_len)
+		longest_len = len;
 
-			if (len > 0 && !longest)
-				break;
-		}
+	    if (len > 0 && !longest)
+		break;
 	}
-	from->n_flags &= ~NF_MARK;
-	return (longest_len);
+    }
+    from->n_flags &= ~NF_MARK;
+    return (longest_len);
 }
 
-
 /* do topological sort on graph */
 static void
 tsort(void)
 {
-	NODE *n, *next;
-	int cnt, i;
-
-	while (graph != NULL) {
-		/*
-		 * Keep getting rid of simple cases until there are none left,
-		 * if there are any nodes still in the graph, then there is
-		 * a cycle in it.
-		 */
-		do {
-			for (cnt = 0, n = graph; n != NULL; n = next) {
-				next = n->n_next;
-				if (n->n_refcnt == 0) {
-					remove_node(n);
-					++cnt;
-				}
-			}
-		} while (graph != NULL && cnt);
-
-		if (graph == NULL)
-			break;
-
-		if (!cycle_buf) {
-			/*
-			 * Allocate space for two cycle logs - one to be used
-			 * as scratch space, the other to save the longest
-			 * cycle.
-			 */
-			for (cnt = 0, n = graph; n != NULL; n = n->n_next)
-				++cnt;
-			cycle_buf = xnfalloc(sizeof(NODE *) * cnt);
-			longest_cycle = xnfalloc(sizeof(NODE *) * cnt);
-			if (cycle_buf == NULL || longest_cycle == NULL)
-				return;
+    NODE *n, *next;
+    int cnt, i;
+
+    while (graph != NULL) {
+	/*
+	 * Keep getting rid of simple cases until there are none left,
+	 * if there are any nodes still in the graph, then there is
+	 * a cycle in it.
+	 */
+	do {
+	    for (cnt = 0, n = graph; n != NULL; n = next) {
+		next = n->n_next;
+		if (n->n_refcnt == 0) {
+		    remove_node(n);
+		    ++cnt;
 		}
-		for (n = graph; n != NULL; n = n->n_next)
-			if (!(n->n_flags & NF_ACYCLIC)) {
-				if ((cnt = find_cycle(n, n, 0, 0))) {
-					ErrorF("tsort: cycle in data");
-					for (i = 0; i < cnt; i++)
-						ErrorF("%s",
-						    longest_cycle[i]->n_name);
-					remove_node(n);
-					clear_cycle();
-					break;
-				} else {
-					/* to avoid further checks */
-					n->n_flags  |= NF_ACYCLIC;
-					clear_cycle();
-				}
-			}
-
-		if (n == NULL)
-			ErrorF("tsort: internal error -- could not find cycle");
+	    }
+	} while (graph != NULL && cnt);
+
+	if (graph == NULL)
+	    break;
+
+	if (!cycle_buf) {
+	    /*
+	     * Allocate space for two cycle logs - one to be used
+	     * as scratch space, the other to save the longest
+	     * cycle.
+	     */
+	    for (cnt = 0, n = graph; n != NULL; n = n->n_next)
+		++cnt;
+	    cycle_buf = xnfalloc(sizeof(NODE *) * cnt);
+	    longest_cycle = xnfalloc(sizeof(NODE *) * cnt);
+	    if (cycle_buf == NULL || longest_cycle == NULL)
+		return;
 	}
-	if (cycle_buf)
-		xfree(cycle_buf);
-	if (longest_cycle)
-		xfree(longest_cycle);
-	if (graph)
-		free_nodes(graph);
+	for (n = graph; n != NULL; n = n->n_next)
+	    if (!(n->n_flags & NF_ACYCLIC)) {
+		if ((cnt = find_cycle(n, n, 0, 0))) {
+		    ErrorF("tsort: cycle in data");
+		    for (i = 0; i < cnt; i++)
+			ErrorF("%s", longest_cycle[i]->n_name);
+		    remove_node(n);
+		    clear_cycle();
+		    break;
+		} else {
+		    /* to avoid further checks */
+		    n->n_flags |= NF_ACYCLIC;
+		    clear_cycle();
+		}
+	    }
+
+	if (n == NULL)
+	    ErrorF("tsort: internal error -- could not find cycle");
+    }
+    if (cycle_buf)
+	xfree(cycle_buf);
+    if (longest_cycle)
+	xfree(longest_cycle);
+    if (graph)
+	free_nodes(graph);
 }
 
 void
 LoaderSortExtensions()
 {
-	int i, j;
-	ExtensionModule *ext, *newList;
-	NODE *node;
-
-	graph = NULL;
-	longest = 0;
-	sorted = NULL;
-	last = NULL;
-	cycle_buf = NULL;
-	longest_cycle = NULL;
-	
-	/*
-	 * Parse list and build the graph.  Enter them in reverse order
-	 * because tsort() will reverse those that have no depedencies.
-	 */
-	for (i = numExtensionModules - 1; i >= 0; i--) {
-		ext = &ExtensionModuleList[i];
-		add_arc(ext->name, ext->name);
+    int i, j;
+    ExtensionModule *ext, *newList;
+    NODE *node;
+
+    graph = NULL;
+    longest = 0;
+    sorted = NULL;
+    last = NULL;
+    cycle_buf = NULL;
+    longest_cycle = NULL;
+
+    /*
+     * Parse list and build the graph.  Enter them in reverse order
+     * because tsort() will reverse those that have no depedencies.
+     */
+    for (i = numExtensionModules - 1; i >= 0; i--) {
+	ext = &ExtensionModuleList[i];
+	add_arc(ext->name, ext->name);
 #ifdef DEBUG
-		ErrorF("Extension %s:\n", ext->name);
+	ErrorF("Extension %s:\n", ext->name);
 #endif
-		if (ext->initDependencies)
-			for (j = 0; ext->initDependencies[j]; j++) {
-				add_arc(ext->initDependencies[j], ext->name);
+	if (ext->initDependencies)
+	    for (j = 0; ext->initDependencies[j]; j++) {
+		add_arc(ext->initDependencies[j], ext->name);
 #ifdef DEBUG
-				ErrorF("\t%s\n", ext->initDependencies[j]);
+		ErrorF("\t%s\n", ext->initDependencies[j]);
 #endif
-		}
-	}
-	tsort();
-	newList = xnfalloc((numExtensionModules + 1) * sizeof(ExtensionModule));
-	i = 0;
-	for (node = sorted; node; node = node->n_next) {
-		for (j = 0; j < numExtensionModules; j++)
-			if (!strcmp(node->n_name, ExtensionModuleList[j].name))
-				break;
-		if (j != numExtensionModules)
-			newList[i++] = ExtensionModuleList[j];
-	}
-	if (sorted)
-		free_nodes(sorted);
-	newList[i].name = NULL;
-	xfree(ExtensionModuleList);
-	ExtensionModuleList = newList;
+	    }
+    }
+    tsort();
+    newList = xnfalloc((numExtensionModules + 1) * sizeof(ExtensionModule));
+    i = 0;
+    for (node = sorted; node; node = node->n_next) {
+	for (j = 0; j < numExtensionModules; j++)
+	    if (!strcmp(node->n_name, ExtensionModuleList[j].name))
+		break;
+	if (j != numExtensionModules)
+	    newList[i++] = ExtensionModuleList[j];
+    }
+    if (sorted)
+	free_nodes(sorted);
+    newList[i].name = NULL;
+    xfree(ExtensionModuleList);
+    ExtensionModuleList = newList;
 #ifdef DEBUG
-	for (i = 0; ExtensionModuleList[i].name; i++)
-		ErrorF("Extension %s\n", ExtensionModuleList[i].name);
+    for (i = 0; ExtensionModuleList[i].name; i++)
+	ErrorF("Extension %s\n", ExtensionModuleList[i].name);
 #endif
 }
-