svn merge ^/branches/released .

4 files changed, 124 insertions, 261 deletions

diff --git a/xorg-server/hw/xfree86/parser/DRI.c b/xorg-server/hw/xfree86/parser/DRI.c
index 12b8d1d1a..4847bef2c 100644
--- a/xorg-server/hw/xfree86/parser/DRI.c
+++ b/xorg-server/hw/xfree86/parser/DRI.c
@@ -1,187 +1,123 @@
-/* DRI.c -- DRI Section in XF86Config file
- * Created: Fri Mar 19 08:40:22 1999 by faith@precisioninsight.com
- * Revised: Thu Jun 17 16:08:05 1999 by faith@precisioninsight.com
- *
- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * 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 (including the next
- * paragraph) 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
- * PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
- * 
- * 
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86Parser.h"
-#include "xf86tokens.h"
-#include "Configint.h"
-
-extern LexRec val;
-
-static xf86ConfigSymTabRec DRITab[] =
-{
-    {ENDSECTION, "endsection"},
-    {GROUP,      "group"},
-    {BUFFERS,    "buffers"},
-    {MODE,       "mode"},
-    {-1,         ""},
-};
-
-#define CLEANUP xf86freeBuffersList
-
-static void
-xf86freeBuffersList (XF86ConfBuffersPtr ptr)
-{
-    XF86ConfBuffersPtr prev;
-
-    while (ptr) {
-	TestFree (ptr->buf_flags);
-	TestFree (ptr->buf_comment);
-	prev = ptr;
-	ptr  = ptr->list.next;
-	free (prev);
-    }
-}
-
-static XF86ConfBuffersPtr
-xf86parseBuffers (void)
-{
-    int token;
-    parsePrologue (XF86ConfBuffersPtr, XF86ConfBuffersRec)
-
-    if (xf86getSubToken (&(ptr->buf_comment)) != NUMBER)
-	Error ("Buffers count expected", NULL);
-    ptr->buf_count = val.num;
-
-    if (xf86getSubToken (&(ptr->buf_comment)) != NUMBER)
-	Error ("Buffers size expected", NULL);
-    ptr->buf_size = val.num;
-
-    if ((token = xf86getSubToken (&(ptr->buf_comment))) == STRING) {
-	ptr->buf_flags = val.str;
-	if ((token = xf86getToken (NULL)) == COMMENT)
-	    ptr->buf_comment = xf86addComment(ptr->buf_comment, val.str);
-	else
-	    xf86unGetToken(token);
-    }
-
-#ifdef DEBUG
-    printf ("Buffers parsed\n");
-#endif
-
-    return ptr;
-}
-
-#undef CLEANUP
-	
-#define CLEANUP xf86freeDRI
-
-XF86ConfDRIPtr
-xf86parseDRISection (void)
-{
-    int token;
-    parsePrologue (XF86ConfDRIPtr, XF86ConfDRIRec);
-
-    /* Zero is a valid value for this. */
-    ptr->dri_group = -1;
-    while ((token = xf86getToken (DRITab)) != ENDSECTION) {
-	switch (token)
-	    {
-	    case GROUP:
-		if ((token = xf86getSubToken (&(ptr->dri_comment))) == STRING)
-		    ptr->dri_group_name = val.str;
-		else if (token == NUMBER)
-		    ptr->dri_group = val.num;
-		else
-		    Error (GROUP_MSG, NULL);
-		break;
-	    case MODE:
-		if (xf86getSubToken (&(ptr->dri_comment)) != NUMBER)
-		    Error (NUMBER_MSG, "Mode");
-                if (val.numType != PARSE_OCTAL)
-                    Error (MUST_BE_OCTAL_MSG, val.num);
-		ptr->dri_mode = val.num;
-		break;
-	    case BUFFERS:
-		HANDLE_LIST (dri_buffers_lst, xf86parseBuffers,
-			     XF86ConfBuffersPtr);
-		break;
-	    case EOF_TOKEN:
-		Error (UNEXPECTED_EOF_MSG, NULL);
-		break;
-	    case COMMENT:
-		ptr->dri_comment = xf86addComment(ptr->dri_comment, val.str);
-		break;
-	    default:
-		Error (INVALID_KEYWORD_MSG, xf86tokenString ());
-		break;
-	    }
-    }
-    
-#ifdef DEBUG
-    ErrorF("DRI section parsed\n");
-#endif
-    
-    return ptr;
-}
-
-#undef CLEANUP
-
-void
-xf86printDRISection (FILE * cf, XF86ConfDRIPtr ptr)
-{
-    XF86ConfBuffersPtr bufs;
-    
-    if (ptr == NULL)
-	return;
-    
-    fprintf (cf, "Section \"DRI\"\n");
-    if (ptr->dri_comment)
-	fprintf (cf, "%s", ptr->dri_comment);
-    if (ptr->dri_group_name)
-	fprintf (cf, "\tGroup        \"%s\"\n", ptr->dri_group_name);
-    else if (ptr->dri_group >= 0)
-	fprintf (cf, "\tGroup        %d\n", ptr->dri_group);
-    if (ptr->dri_mode)
-	fprintf (cf, "\tMode         0%o\n", ptr->dri_mode);
-    for (bufs = ptr->dri_buffers_lst; bufs; bufs = bufs->list.next) {
-	fprintf (cf, "\tBuffers      %d %d",
-		 bufs->buf_count, bufs->buf_size);
-	if (bufs->buf_flags) fprintf (cf, " \"%s\"", bufs->buf_flags);
-	if (bufs->buf_comment)
-	    fprintf(cf, "%s", bufs->buf_comment);
-	else
-	    fprintf (cf, "\n");
-    }
-    fprintf (cf, "EndSection\n\n");
-}
-
-void
-xf86freeDRI (XF86ConfDRIPtr ptr)
-{
-    if (ptr == NULL)
-	return;
-    
-    xf86freeBuffersList (ptr->dri_buffers_lst);
-    TestFree (ptr->dri_comment);
-    free (ptr);
-}
+/* DRI.c -- DRI Section in XF86Config file

+ * Created: Fri Mar 19 08:40:22 1999 by faith@precisioninsight.com

+ * Revised: Thu Jun 17 16:08:05 1999 by faith@precisioninsight.com

+ *

+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.

+ * All Rights Reserved.

+ *

+ * 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 (including the next

+ * paragraph) 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

+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.

+ * 

+ * 

+ */

+

+#ifdef HAVE_XORG_CONFIG_H

+#include <xorg-config.h>

+#endif

+

+#include "xf86Parser.h"

+#include "xf86tokens.h"

+#include "Configint.h"

+

+extern LexRec val;

+

+static xf86ConfigSymTabRec DRITab[] =

+{

+    {ENDSECTION, "endsection"},

+    {GROUP,      "group"},

+    {MODE,       "mode"},

+    {-1,         ""},

+};

+

+#define CLEANUP xf86freeDRI

+

+XF86ConfDRIPtr

+xf86parseDRISection (void)

+{

+    int token;

+    parsePrologue (XF86ConfDRIPtr, XF86ConfDRIRec);

+

+    /* Zero is a valid value for this. */

+    ptr->dri_group = -1;

+    while ((token = xf86getToken (DRITab)) != ENDSECTION) {

+	switch (token)

+	    {

+	    case GROUP:

+		if ((token = xf86getSubToken (&(ptr->dri_comment))) == STRING)

+		    ptr->dri_group_name = val.str;

+		else if (token == NUMBER)

+		    ptr->dri_group = val.num;

+		else

+		    Error (GROUP_MSG, NULL);

+		break;

+	    case MODE:

+		if (xf86getSubToken (&(ptr->dri_comment)) != NUMBER)

+		    Error (NUMBER_MSG, "Mode");

+                if (val.numType != PARSE_OCTAL)

+                    Error (MUST_BE_OCTAL_MSG, val.num);

+		ptr->dri_mode = val.num;

+		break;

+	    case EOF_TOKEN:

+		Error (UNEXPECTED_EOF_MSG, NULL);

+		break;

+	    case COMMENT:

+		ptr->dri_comment = xf86addComment(ptr->dri_comment, val.str);

+		break;

+	    default:

+		Error (INVALID_KEYWORD_MSG, xf86tokenString ());

+		break;

+	    }

+    }

+    

+#ifdef DEBUG

+    ErrorF("DRI section parsed\n");

+#endif

+    

+    return ptr;

+}

+

+#undef CLEANUP

+

+void

+xf86printDRISection (FILE * cf, XF86ConfDRIPtr ptr)

+{

+    if (ptr == NULL)

+	return;

+    

+    fprintf (cf, "Section \"DRI\"\n");

+    if (ptr->dri_comment)

+	fprintf (cf, "%s", ptr->dri_comment);

+    if (ptr->dri_group_name)

+	fprintf (cf, "\tGroup        \"%s\"\n", ptr->dri_group_name);

+    else if (ptr->dri_group >= 0)

+	fprintf (cf, "\tGroup        %d\n", ptr->dri_group);

+    if (ptr->dri_mode)

+	fprintf (cf, "\tMode         0%o\n", ptr->dri_mode);

+    fprintf (cf, "EndSection\n\n");

+}

+

+void

+xf86freeDRI (XF86ConfDRIPtr ptr)

+{

+    if (ptr == NULL)

+	return;

+    

+    TestFree (ptr->dri_comment);

+    free (ptr);

+}

diff --git a/xorg-server/hw/xfree86/parser/scan.c b/xorg-server/hw/xfree86/parser/scan.c
index 783a42545..b829868f7 100644
--- a/xorg-server/hw/xfree86/parser/scan.c
+++ b/xorg-server/hw/xfree86/parser/scan.c
@@ -115,53 +115,6 @@ static int pushToken = LOCK_TOKEN;
 static int eol_seen = 0;		/* private state to handle comments */

 LexRec val;

 

-/* 

- * xf86strToUL --

- *

- *  A portable, but restricted, version of strtoul().  It only understands

- *  hex, octal, and decimal.  But it's good enough for our needs.

- */

-static unsigned int

-xf86strToUL (char *str)

-{

-	int base = 10;

-	char *p = str;

-	unsigned int tot = 0;

-

-	if (*p == '0')

-	{

-		p++;

-		if ((*p == 'x') || (*p == 'X'))

-		{

-			p++;

-			base = 16;

-		}

-		else

-			base = 8;

-	}

-	while (*p)

-	{

-		if ((*p >= '0') && (*p <= ((base == 8) ? '7' : '9')))

-		{

-			tot = tot * base + (*p - '0');

-		}

-		else if ((base == 16) && (*p >= 'a') && (*p <= 'f'))

-		{

-			tot = tot * base + 10 + (*p - 'a');

-		}

-		else if ((base == 16) && (*p >= 'A') && (*p <= 'F'))

-		{

-			tot = tot * base + 10 + (*p - 'A');

-		}

-		else

-		{

-			return tot;

-		}

-		p++;

-	}

-	return tot;

-}

-

 /*

  * xf86getNextLine --

  *

@@ -434,7 +387,7 @@ again:
 				configRBuf[i++] = c;

 			configPos--;		/* GJA -- one too far */

 			configRBuf[i] = '\0';

-			val.num = xf86strToUL (configRBuf);

+			val.num = strtoul (configRBuf, NULL, 0);

 			val.realnum = atof (configRBuf);

 			return NUMBER;

 		}

@@ -601,7 +554,6 @@ xf86pathIsSafe(const char *path)
  *    %P    projroot

  *    %C    sysconfdir

  *    %D    datadir

- *    %M    config file format version number

  *    %%    %

  */

 

@@ -626,11 +578,6 @@ xf86pathIsSafe(const char *path)
 #ifndef XCONFENV

 #define XCONFENV	"XORGCONFIG"

 #endif

-/* xorg.conf is based on XF86Config version 4.   If we ever break

-   compatibility of the xorg.conf syntax, we'll bump this version number. */

-#ifndef CONFIG_FILE_VERSION

-#define CONFIG_FILE_VERSION	4

-#endif

 

 #define BAIL_OUT		do {									\

 							free(result);				\

@@ -661,7 +608,6 @@ DoSubstitution(const char *template, const char *cmdline, const char *projroot,
 	int i, l;

 	static const char *env = NULL;

 	static char *hostname = NULL;

-	static char majorvers[3] = "";

 

 	if (!template)

 		return NULL;

@@ -762,13 +708,6 @@ DoSubstitution(const char *template, const char *cmdline, const char *projroot,
 			case 'D':

 				APPEND_STR(DATADIR);

 				break;

-			case 'M':

-				if (!majorvers[0]) {

-					snprintf(majorvers, sizeof(majorvers),

-						 "%d", CONFIG_FILE_VERSION);

-				}

-				APPEND_STR(majorvers);

-				break;

 			case '%':

 				result[l++] = '%';

 				CHECK_LENGTH;

diff --git a/xorg-server/hw/xfree86/parser/xf86Parser.h b/xorg-server/hw/xfree86/parser/xf86Parser.h
index d35bbab27..f8c9c3cde 100644
--- a/xorg-server/hw/xfree86/parser/xf86Parser.h
+++ b/xorg-server/hw/xfree86/parser/xf86Parser.h
@@ -442,20 +442,9 @@ XF86ConfVendorRec, *XF86ConfVendorPtr;
 

 typedef struct

 {

-	GenericListRec list;

-	int buf_count;

-	int buf_size;

-	char *buf_flags;

-	char *buf_comment;

-}

-XF86ConfBuffersRec, *XF86ConfBuffersPtr;

-

-typedef struct

-{

 	char *dri_group_name;

 	int dri_group;

 	int dri_mode;

-	XF86ConfBuffersPtr dri_buffers_lst;

 	char *dri_comment;

 }

 XF86ConfDRIRec, *XF86ConfDRIPtr;

diff --git a/xorg-server/hw/xfree86/parser/xf86tokens.h b/xorg-server/hw/xfree86/parser/xf86tokens.h
index 3bea43d15..8c7ea1b28 100644
--- a/xorg-server/hw/xfree86/parser/xf86tokens.h
+++ b/xorg-server/hw/xfree86/parser/xf86tokens.h
@@ -273,7 +273,6 @@ typedef enum {
 

     /* DRI Tokens */

     GROUP,

-    BUFFERS,

 

     /* InputClass Tokens */

     MATCH_PRODUCT,