xserver git update 11/9/2010

4 files changed, 221 insertions, 239 deletions

diff --git a/xorg-server/hw/xfree86/parser/Configint.h b/xorg-server/hw/xfree86/parser/Configint.h
index 63e510d8f..670c24da5 100644
--- a/xorg-server/hw/xfree86/parser/Configint.h
+++ b/xorg-server/hw/xfree86/parser/Configint.h
@@ -98,9 +98,6 @@ LexRec, *LexPtr;
 #define parsePrologue(typeptr,typerec) typeptr ptr; \

 if( (ptr=calloc(1,sizeof(typerec))) == NULL ) { return NULL; }

 

-#define parsePrologueVoid(typeptr,typerec) int token; typeptr ptr; \

-if( (ptr=calloc(1,sizeof(typerec))) == NULL ) { return; }

-

 #define HANDLE_RETURN(f,func)\

 if ((ptr->f=func) == NULL)\

 {\

@@ -152,10 +149,6 @@ else\
 "The %s keyword requires a boolean to follow it."

 #define ZAXISMAPPING_MSG \

 "The ZAxisMapping keyword requires 2 positive numbers or X or Y to follow it."

-#define AUTOREPEAT_MSG \

-"The AutoRepeat keyword requires 2 numbers (delay and rate) to follow it."

-#define XLEDS_MSG \

-"The XLeds keyword requries one or more numbers to follow it."

 #define DACSPEED_MSG \

 "The DacSpeed keyword must be followed by a list of up to %d numbers."

 #define DISPLAYSIZE_MSG \

@@ -216,7 +209,5 @@ else\
 /* Warning messages */

 #define OBSOLETE_MSG \

 "Ignoring obsolete keyword \"%s\"."

-#define MOVED_TO_FLAGS_MSG \

-"Keyword \"%s\" is now an Option flag in the ServerFlags section."

 

 #endif /* _Configint_h_ */

diff --git a/xorg-server/hw/xfree86/parser/Flags.c b/xorg-server/hw/xfree86/parser/Flags.c
index b6ffc1538..cdd023222 100644
--- a/xorg-server/hw/xfree86/parser/Flags.c
+++ b/xorg-server/hw/xfree86/parser/Flags.c
@@ -132,7 +132,6 @@ xf86parseFlagsSection (void)
 					if (ServerFlagsTab[i].token == token)

 					{

 						char *valstr = NULL;

-						/* can't use strdup because it calls malloc */

 						tmp = strdup (ServerFlagsTab[i].name);

 						if (hasvalue)

 						{

@@ -365,13 +364,8 @@ xf86optionListCreate( const char **options, int count, int used )
 	}

 	for (i = 0; i < count; i += 2)

 	{

-		/* can't use strdup because it calls malloc */

-		t1 = malloc (sizeof (char) *

-				(strlen (options[i]) + 1));

-		strcpy (t1, options[i]);

-		t2 = malloc (sizeof (char) *

-				(strlen (options[i + 1]) + 1));

-		strcpy (t2, options[i + 1]);

+		t1 = strdup(options[i]);

+		t2 = strdup(options[i + 1]);

 		p = addNewOption2 (p, t1, t2, used);

 	}

 

diff --git a/xorg-server/hw/xfree86/parser/scan.c b/xorg-server/hw/xfree86/parser/scan.c
index 99e1288a5..783a42545 100644
--- a/xorg-server/hw/xfree86/parser/scan.c
+++ b/xorg-server/hw/xfree86/parser/scan.c
@@ -819,6 +819,7 @@ OpenConfigFile(const char *path, const char *cmdline, const char *projroot,
 		}

 	}

 

+	free(pathcopy);

 	if (file) {

 		configFiles[numFiles].file = file;

 		configFiles[numFiles].path = strdup(filepath);

@@ -927,6 +928,7 @@ OpenConfigDir(const char *path, const char *cmdline, const char *projroot,
 		}

 	}

 

+	free(pathcopy);

 	return dirpath;

 }

 

@@ -1088,8 +1090,7 @@ void
 xf86setSection (char *section)

 {

 	free(configSection);

-	configSection = malloc(strlen (section) + 1);

-	strcpy (configSection, section);

+	configSection = strdup(section);

 }

 

 /* 

diff --git a/xorg-server/hw/xfree86/parser/write.c b/xorg-server/hw/xfree86/parser/write.c
index 083203c05..fe51ee7f5 100644
--- a/xorg-server/hw/xfree86/parser/write.c
+++ b/xorg-server/hw/xfree86/parser/write.c
@@ -1,220 +1,216 @@
-/* 
- * Copyright (c) 1997  Metro Link Incorporated
- * 
- * 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 X CONSORTIUM 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 Metro Link shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from Metro Link.
- * 
- */
-/*
- * Copyright (c) 1997-2003 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).
- */
-
-
-/* View/edit this file with tab stops set to 4 */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86Parser.h"
-#include "xf86tokens.h"
-#include "Configint.h"
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <errno.h>
-
-#if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
-#define HAS_SAVED_IDS_AND_SETEUID
-#endif
-#if defined(WIN32)
-#define HAS_NO_UIDS
-#endif
-
-#ifdef HAS_NO_UIDS
-#define doWriteConfigFile xf86writeConfigFile
-#define Local /**/
-#else
-#define Local static
-#endif
-
-Local int
-doWriteConfigFile (const char *filename, XF86ConfigPtr cptr)
-{
-	FILE *cf;
-
-	if ((cf = fopen (filename, "w")) == NULL)
-	{
-		return 0;
-	}
-
-	if (cptr->conf_comment)
-		fprintf (cf, "%s\n", cptr->conf_comment);
-
-	xf86printLayoutSection (cf, cptr->conf_layout_lst);
-
-	if (cptr->conf_files != NULL)
-	{
-		fprintf (cf, "Section \"Files\"\n");
-		xf86printFileSection (cf, cptr->conf_files);
-		fprintf (cf, "EndSection\n\n");
-	}
-
-	if (cptr->conf_modules != NULL)
-	{
-		fprintf (cf, "Section \"Module\"\n");
-		xf86printModuleSection (cf, cptr->conf_modules);
-		fprintf (cf, "EndSection\n\n");
-	}
-
-	xf86printVendorSection (cf, cptr->conf_vendor_lst);
-
-	xf86printServerFlagsSection (cf, cptr->conf_flags);
-
-	xf86printInputSection (cf, cptr->conf_input_lst);
-
-	xf86printInputClassSection (cf, cptr->conf_inputclass_lst);
-
-	xf86printVideoAdaptorSection (cf, cptr->conf_videoadaptor_lst);
-
-	xf86printModesSection (cf, cptr->conf_modes_lst);
-
-	xf86printMonitorSection (cf, cptr->conf_monitor_lst);
-
-	xf86printDeviceSection (cf, cptr->conf_device_lst);
-
-	xf86printScreenSection (cf, cptr->conf_screen_lst);
-
-	xf86printDRISection (cf, cptr->conf_dri);
-
-	xf86printExtensionsSection (cf, cptr->conf_extensions);
-
-	fclose(cf);
-	return 1;
-}
-
-#ifndef HAS_NO_UIDS
-
-int
-xf86writeConfigFile (const char *filename, XF86ConfigPtr cptr)
-{
-	int ret;
-
-#if !defined(HAS_SAVED_IDS_AND_SETEUID)
-	int pid, p;
-	int status;
-	void (*csig)(int);
-#else
-	int ruid, euid;
-#endif
-
-	if (getuid() != geteuid())
-	{
-
-#if !defined(HAS_SAVED_IDS_AND_SETEUID)
-		/* Need to fork to change ruid without loosing euid */
-#ifdef SIGCHLD
-		csig = signal(SIGCHLD, SIG_DFL);
-#endif
-		switch ((pid = fork()))
-		{
-		case -1:
-			ErrorF("xf86writeConfigFile(): fork failed (%s)\n",
-					strerror(errno));
-			return 0;
-		case 0: /* child */
-			if (setuid(getuid()) == -1) 
-			    FatalError("xf86writeConfigFile(): "
-				"setuid failed(%s)\n", 
-				strerror(errno));
-			ret = doWriteConfigFile(filename, cptr);
-			exit(ret);
-			break;
-		default: /* parent */
-			do
-			{
-				p = waitpid(pid, &status, 0);
-			} while (p == -1 && errno == EINTR);
-		}
-#ifdef SIGCHLD
-		signal(SIGCHLD, csig);
-#endif
-		if (p != -1 && WIFEXITED(status) && WEXITSTATUS(status) == 0)
-			return 1;	/* success */
-		else
-			return 0;
-
-#else /* HAS_SAVED_IDS_AND_SETEUID */
-
-		ruid = getuid();
-		euid = geteuid();
-
-		if (seteuid(ruid) == -1)
-		{
-			ErrorF("xf86writeConfigFile(): seteuid(%d) failed (%s)\n",
-					ruid, strerror(errno));
-			return 0;
-		}
-		ret = doWriteConfigFile(filename, cptr);
-
-		if (seteuid(euid) == -1)
-		{
-			ErrorF("xf86writeConfigFile(): seteuid(%d) failed (%s)\n",
-					euid, strerror(errno));
-		}
-		return ret;
-
-#endif /* HAS_SAVED_IDS_AND_SETEUID */
-
-	}
-	else
-	{
-		return doWriteConfigFile(filename, cptr);
-	}
-}
-
-#endif /* !HAS_NO_UIDS */
+/* 

+ * Copyright (c) 1997  Metro Link Incorporated

+ * 

+ * 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 X CONSORTIUM 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 Metro Link shall not be

+ * used in advertising or otherwise to promote the sale, use or other dealings

+ * in this Software without prior written authorization from Metro Link.

+ * 

+ */

+/*

+ * Copyright (c) 1997-2003 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).

+ */

+

+

+/* View/edit this file with tab stops set to 4 */

+

+#ifdef HAVE_XORG_CONFIG_H

+#include <xorg-config.h>

+#endif

+

+#include "xf86Parser.h"

+#include "xf86tokens.h"

+#include "Configint.h"

+

+#include <unistd.h>

+#include <sys/types.h>

+#include <sys/wait.h>

+#include <signal.h>

+#include <errno.h>

+

+#if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)

+#define HAS_SAVED_IDS_AND_SETEUID

+#endif

+#if defined(WIN32)

+#define HAS_NO_UIDS

+#endif

+

+#ifdef HAS_NO_UIDS

+#define doWriteConfigFile xf86writeConfigFile

+#define Local /**/

+#else

+#define Local static

+#endif

+

+Local int

+doWriteConfigFile (const char *filename, XF86ConfigPtr cptr)

+{

+	FILE *cf;

+

+	if ((cf = fopen (filename, "w")) == NULL)

+	{

+		return 0;

+	}

+

+	if (cptr->conf_comment)

+		fprintf (cf, "%s\n", cptr->conf_comment);

+

+	xf86printLayoutSection (cf, cptr->conf_layout_lst);

+

+	if (cptr->conf_files != NULL)

+	{

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

+		xf86printFileSection (cf, cptr->conf_files);

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

+	}

+

+	if (cptr->conf_modules != NULL)

+	{

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

+		xf86printModuleSection (cf, cptr->conf_modules);

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

+	}

+

+	xf86printVendorSection (cf, cptr->conf_vendor_lst);

+

+	xf86printServerFlagsSection (cf, cptr->conf_flags);

+

+	xf86printInputSection (cf, cptr->conf_input_lst);

+

+	xf86printInputClassSection (cf, cptr->conf_inputclass_lst);

+

+	xf86printVideoAdaptorSection (cf, cptr->conf_videoadaptor_lst);

+

+	xf86printModesSection (cf, cptr->conf_modes_lst);

+

+	xf86printMonitorSection (cf, cptr->conf_monitor_lst);

+

+	xf86printDeviceSection (cf, cptr->conf_device_lst);

+

+	xf86printScreenSection (cf, cptr->conf_screen_lst);

+

+	xf86printDRISection (cf, cptr->conf_dri);

+

+	xf86printExtensionsSection (cf, cptr->conf_extensions);

+

+	fclose(cf);

+	return 1;

+}

+

+#ifndef HAS_NO_UIDS

+

+int

+xf86writeConfigFile (const char *filename, XF86ConfigPtr cptr)

+{

+	int ret;

+

+#if !defined(HAS_SAVED_IDS_AND_SETEUID)

+	int pid, p;

+	int status;

+	void (*csig)(int);

+#else

+	int ruid, euid;

+#endif

+

+	if (getuid() != geteuid())

+	{

+

+#if !defined(HAS_SAVED_IDS_AND_SETEUID)

+		/* Need to fork to change ruid without loosing euid */

+		csig = signal(SIGCHLD, SIG_DFL);

+		switch ((pid = fork()))

+		{

+		case -1:

+			ErrorF("xf86writeConfigFile(): fork failed (%s)\n",

+					strerror(errno));

+			return 0;

+		case 0: /* child */

+			if (setuid(getuid()) == -1) 

+			    FatalError("xf86writeConfigFile(): "

+				"setuid failed(%s)\n", 

+				strerror(errno));

+			ret = doWriteConfigFile(filename, cptr);

+			exit(ret);

+			break;

+		default: /* parent */

+			do

+			{

+				p = waitpid(pid, &status, 0);

+			} while (p == -1 && errno == EINTR);

+		}

+		signal(SIGCHLD, csig);

+		if (p != -1 && WIFEXITED(status) && WEXITSTATUS(status) == 0)

+			return 1;	/* success */

+		else

+			return 0;

+

+#else /* HAS_SAVED_IDS_AND_SETEUID */

+

+		ruid = getuid();

+		euid = geteuid();

+

+		if (seteuid(ruid) == -1)

+		{

+			ErrorF("xf86writeConfigFile(): seteuid(%d) failed (%s)\n",

+					ruid, strerror(errno));

+			return 0;

+		}

+		ret = doWriteConfigFile(filename, cptr);

+

+		if (seteuid(euid) == -1)

+		{

+			ErrorF("xf86writeConfigFile(): seteuid(%d) failed (%s)\n",

+					euid, strerror(errno));

+		}

+		return ret;

+

+#endif /* HAS_SAVED_IDS_AND_SETEUID */

+

+	}

+	else

+	{

+		return doWriteConfigFile(filename, cptr);

+	}

+}

+

+#endif /* !HAS_NO_UIDS */