svn merge ^/branches/released .

1 files changed, 311 insertions, 318 deletions

diff --git a/xorg-server/os/osinit.c b/xorg-server/os/osinit.c
index f27a5b8f3..2080cb782 100644
--- a/xorg-server/os/osinit.c
+++ b/xorg-server/os/osinit.c
@@ -1,318 +1,311 @@
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-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.
-
-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
-OPEN GROUP 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 Open Group 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 Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-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 Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL 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_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <stdio.h>
-#include <X11/X.h>
-#include "os.h"
-#include "osdep.h"
-#include <X11/Xos.h>
-#include <signal.h>
-#include <errno.h>
-#ifdef HAVE_DLFCN_H
-# include <dlfcn.h>
-#endif
-#ifdef HAVE_BACKTRACE
-#include <execinfo.h>
-#endif
-
-
-#include "dixstruct.h"
-
-#ifndef PATH_MAX
-#ifdef MAXPATHLEN
-#define PATH_MAX MAXPATHLEN
-#else
-#define PATH_MAX 1024
-#endif
-#endif
-
-
-#if !defined(SYSV) && !defined(WIN32) 
-#include <sys/resource.h>
-#endif
-
-#ifndef ADMPATH
-#define ADMPATH "/usr/adm/X%smsgs"
-#endif
-
-extern char *display;
-#ifdef RLIMIT_DATA
-int limitDataSpace = -1;
-#endif
-#ifdef RLIMIT_STACK
-int limitStackSpace = -1;
-#endif
-#ifdef RLIMIT_NOFILE
-int limitNoFile = -1;
-#endif
-
-static OsSigWrapperPtr OsSigWrapper = NULL;
-
-OsSigWrapperPtr
-OsRegisterSigWrapper(OsSigWrapperPtr newSigWrapper)
-{
-    OsSigWrapperPtr oldSigWrapper = OsSigWrapper;
-
-    OsSigWrapper = newSigWrapper;
-
-    return oldSigWrapper;
-}
-
-/*
- * OsSigHandler --
- *    Catch unexpected signals and exit or continue cleanly.
- */
-static void
-#ifdef SA_SIGINFO
-OsSigHandler(int signo, siginfo_t *sip, void *unused)
-#else
-OsSigHandler(int signo)
-#endif
-{
-#ifdef RTLD_DI_SETSIGNAL
-  const char *dlerr = dlerror();
-
-  if (dlerr) {
-      LogMessage(X_ERROR, "Dynamic loader error: %s\n", dlerr);
-  }
-#endif /* RTLD_DI_SETSIGNAL */
-
-  if (OsSigWrapper != NULL) {
-      if (OsSigWrapper(signo) == 0) {
-	  /* ddx handled signal and wants us to continue */
-	  return;
-      }
-  }
-
-  /* log, cleanup, and abort */
-  xorg_backtrace();
-
-#ifdef SA_SIGINFO
-  if (sip->si_code == SI_USER) {
-      ErrorF("Recieved signal %d sent by process %ld, uid %ld\n",
-	     signo, (long) sip->si_pid, (long) sip->si_uid);
-  } else {
-      switch (signo) {
-          case SIGSEGV:
-          case SIGBUS:
-          case SIGILL:
-          case SIGFPE:
-	      ErrorF("%s at address %p\n", strsignal(signo), sip->si_addr);
-      }
-  }
-#endif
-
-  FatalError("Caught signal %d (%s). Server aborting\n",
-	     signo, strsignal(signo));
-}
-
-void
-OsInit(void)
-{
-    static Bool been_here = FALSE;
-    static char* devnull = "/dev/null";
-    char fname[PATH_MAX];
-
-    if (!been_here) {
-#ifndef _MSC_VER
-	struct sigaction act, oact;
-	int i;
-	int siglist[] = { SIGSEGV, SIGQUIT, SIGILL, SIGFPE, SIGBUS,
-			  SIGSYS,
-			  SIGXCPU,
-			  SIGXFSZ,
-#ifdef SIGEMT
-			  SIGEMT,
-#endif
-			  0 /* must be last */ };
-	sigemptyset(&act.sa_mask);
-#ifdef SA_SIGINFO
-	act.sa_sigaction = OsSigHandler;
-	act.sa_flags = SA_SIGINFO;
-#else
-        act.sa_handler = OsSigHandler;
-        act.sa_flags = 0;
-#endif
-	for (i = 0; siglist[i] != 0; i++) {
-	    if (sigaction(siglist[i], &act, &oact)) {
-		ErrorF("failed to install signal handler for signal %d: %s\n",
-		       siglist[i], strerror(errno));
-	    }
-	}
-#ifdef HAVE_BACKTRACE
-	/*
-	 * initialize the backtracer, since the ctor calls dlopen(), which
-	 * calls malloc(), which isn't signal-safe.
-	 */
-	do {
-	    void *array;
-	    backtrace(&array, 1);
-	} while (0);
-#endif
-
-#ifdef RTLD_DI_SETSIGNAL
-	/* Tell runtime linker to send a signal we can catch instead of SIGKILL
-	 * for failures to load libraries/modules at runtime so we can clean up
-	 * after ourselves.
-	 */
-	int failure_signal = SIGQUIT;
-	dlinfo(RTLD_SELF, RTLD_DI_SETSIGNAL, &failure_signal);
-#endif
-#endif
-#if !defined(__CYGWIN__) 
-	fclose(stdin);
-	fclose(stdout);
-#endif
-	/* 
-	 * If a write of zero bytes to stderr returns non-zero, i.e. -1, 
-	 * then writing to stderr failed, and we'll write somewhere else 
-	 * instead. (Apparently this never happens in the Real World.)
-	 */
-	if (write (2, fname, 0) == -1) 
-	{
-	    FILE *err;
-
-	    if (strlen (display) + strlen (ADMPATH) + 1 < sizeof fname)
-		sprintf (fname, ADMPATH, display);
-	    else
-		strcpy (fname, devnull);
-	    /*
-	     * uses stdio to avoid os dependencies here,
-	     * a real os would use
- 	     *  open (fname, O_WRONLY|O_APPEND|O_CREAT, 0666)
-	     */
-	    if (!(err = fopen (fname, "a+")))
-		err = fopen (devnull, "w");
-	    if (err && (fileno(err) != 2)) {
-		dup2 (fileno (err), 2);
-		fclose (err);
-	    }
-#if defined(SYSV) || defined(SVR4) || defined(WIN32) || defined(__CYGWIN__)
-	    {
-	    static char buf[BUFSIZ];
-	    setvbuf (stderr, buf, _IOLBF, BUFSIZ);
-	    }
-#else
-	    setlinebuf(stderr);
-#endif
-	}
-
-#ifndef _MSC_VER
-	if (getpgrp () == 0)
-	    setpgid (0, 0);
-#endif
-
-#ifdef RLIMIT_DATA
-	if (limitDataSpace >= 0)
-	{
-	    struct rlimit	rlim;
-
-	    if (!getrlimit(RLIMIT_DATA, &rlim))
-	    {
-		if ((limitDataSpace > 0) && (limitDataSpace < rlim.rlim_max))
-		    rlim.rlim_cur = limitDataSpace;
-		else
-		    rlim.rlim_cur = rlim.rlim_max;
-		(void)setrlimit(RLIMIT_DATA, &rlim);
-	    }
-	}
-#endif
-#ifdef RLIMIT_STACK
-	if (limitStackSpace >= 0)
-	{
-	    struct rlimit	rlim;
-
-	    if (!getrlimit(RLIMIT_STACK, &rlim))
-	    {
-		if ((limitStackSpace > 0) && (limitStackSpace < rlim.rlim_max))
-		    rlim.rlim_cur = limitStackSpace;
-		else
-		    rlim.rlim_cur = rlim.rlim_max;
-		(void)setrlimit(RLIMIT_STACK, &rlim);
-	    }
-	}
-#endif
-#ifdef RLIMIT_NOFILE
-	if (limitNoFile >= 0)
-	{
-	    struct rlimit	rlim;
-
-	    if (!getrlimit(RLIMIT_NOFILE, &rlim))
-	    {
-		if ((limitNoFile > 0) && (limitNoFile < rlim.rlim_max))
-		    rlim.rlim_cur = limitNoFile;
-		else
-		    rlim.rlim_cur = rlim.rlim_max;
-		(void)setrlimit(RLIMIT_NOFILE, &rlim);
-	    }
-	}
-#endif
-	LockServer();
-	been_here = TRUE;
-    }
-    TimerInit();
-    OsVendorInit();
-    /*
-     * No log file by default.  OsVendorInit() should call LogInit() with the
-     * log file name if logging to a file is desired.
-     */
-    LogInit(NULL, NULL);
-    SmartScheduleInit ();
-}
-
-void
-OsCleanup(Bool terminating)
-{
-    if (terminating)
-    {
-	UnlockServer();
-    }
-}
+/***********************************************************

+

+Copyright 1987, 1998  The Open Group

+

+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.

+

+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

+OPEN GROUP 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 Open Group 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 Open Group.

+

+

+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.

+

+                        All Rights Reserved

+

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

+documentation for any purpose and without fee is hereby granted, 

+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 Digital not be

+used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.  

+

+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

+DIGITAL 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_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include <stdio.h>

+#include <X11/X.h>

+#include "os.h"

+#include "osdep.h"

+#include <X11/Xos.h>

+#include <signal.h>

+#include <errno.h>

+#ifdef HAVE_DLFCN_H

+# include <dlfcn.h>

+#endif

+#ifdef HAVE_BACKTRACE

+#include <execinfo.h>

+#endif

+

+#include "misc.h"

+

+#include "dixstruct.h"

+

+

+#if !defined(SYSV) && !defined(WIN32) 

+#include <sys/resource.h>

+#endif

+

+#ifndef ADMPATH

+#define ADMPATH "/usr/adm/X%smsgs"

+#endif

+

+extern char *display;

+#ifdef RLIMIT_DATA

+int limitDataSpace = -1;

+#endif

+#ifdef RLIMIT_STACK

+int limitStackSpace = -1;

+#endif

+#ifdef RLIMIT_NOFILE

+int limitNoFile = -1;

+#endif

+

+static OsSigWrapperPtr OsSigWrapper = NULL;

+

+OsSigWrapperPtr

+OsRegisterSigWrapper(OsSigWrapperPtr newSigWrapper)

+{

+    OsSigWrapperPtr oldSigWrapper = OsSigWrapper;

+

+    OsSigWrapper = newSigWrapper;

+

+    return oldSigWrapper;

+}

+

+/*

+ * OsSigHandler --

+ *    Catch unexpected signals and exit or continue cleanly.

+ */

+static void

+#ifdef SA_SIGINFO

+OsSigHandler(int signo, siginfo_t *sip, void *unused)

+#else

+OsSigHandler(int signo)

+#endif

+{

+#ifdef RTLD_DI_SETSIGNAL

+  const char *dlerr = dlerror();

+

+  if (dlerr) {

+      LogMessage(X_ERROR, "Dynamic loader error: %s\n", dlerr);

+  }

+#endif /* RTLD_DI_SETSIGNAL */

+

+  if (OsSigWrapper != NULL) {

+      if (OsSigWrapper(signo) == 0) {

+	  /* ddx handled signal and wants us to continue */

+	  return;

+      }

+  }

+

+  /* log, cleanup, and abort */

+  xorg_backtrace();

+

+#ifdef SA_SIGINFO

+  if (sip->si_code == SI_USER) {

+      ErrorF("Recieved signal %d sent by process %ld, uid %ld\n",

+	     signo, (long) sip->si_pid, (long) sip->si_uid);

+  } else {

+      switch (signo) {

+          case SIGSEGV:

+          case SIGBUS:

+          case SIGILL:

+          case SIGFPE:

+	      ErrorF("%s at address %p\n", strsignal(signo), sip->si_addr);

+      }

+  }

+#endif

+

+  FatalError("Caught signal %d (%s). Server aborting\n",

+	     signo, strsignal(signo));

+}

+

+void

+OsInit(void)

+{

+    static Bool been_here = FALSE;

+    static char* devnull = "/dev/null";

+    char fname[PATH_MAX];

+

+    if (!been_here) {

+#ifndef _MSC_VER

+	struct sigaction act, oact;

+	int i;

+	int siglist[] = { SIGSEGV, SIGQUIT, SIGILL, SIGFPE, SIGBUS,

+			  SIGSYS,

+			  SIGXCPU,

+			  SIGXFSZ,

+#ifdef SIGEMT

+			  SIGEMT,

+#endif

+			  0 /* must be last */ };

+	sigemptyset(&act.sa_mask);

+#ifdef SA_SIGINFO

+	act.sa_sigaction = OsSigHandler;

+	act.sa_flags = SA_SIGINFO;

+#else

+        act.sa_handler = OsSigHandler;

+        act.sa_flags = 0;

+#endif

+	for (i = 0; siglist[i] != 0; i++) {

+	    if (sigaction(siglist[i], &act, &oact)) {

+		ErrorF("failed to install signal handler for signal %d: %s\n",

+		       siglist[i], strerror(errno));

+	    }

+	}

+#ifdef HAVE_BACKTRACE

+	/*

+	 * initialize the backtracer, since the ctor calls dlopen(), which

+	 * calls malloc(), which isn't signal-safe.

+	 */

+	do {

+	    void *array;

+	    backtrace(&array, 1);

+	} while (0);

+#endif

+

+#ifdef RTLD_DI_SETSIGNAL

+	/* Tell runtime linker to send a signal we can catch instead of SIGKILL

+	 * for failures to load libraries/modules at runtime so we can clean up

+	 * after ourselves.

+	 */

+	int failure_signal = SIGQUIT;

+	dlinfo(RTLD_SELF, RTLD_DI_SETSIGNAL, &failure_signal);

+#endif

+#endif

+#if !defined(__CYGWIN__) 

+	fclose(stdin);

+	fclose(stdout);

+#endif

+	/* 

+	 * If a write of zero bytes to stderr returns non-zero, i.e. -1, 

+	 * then writing to stderr failed, and we'll write somewhere else 

+	 * instead. (Apparently this never happens in the Real World.)

+	 */

+	if (write (2, fname, 0) == -1) 

+	{

+	    FILE *err;

+

+	    if (strlen (display) + strlen (ADMPATH) + 1 < sizeof fname)

+		sprintf (fname, ADMPATH, display);

+	    else

+		strcpy (fname, devnull);

+	    /*

+	     * uses stdio to avoid os dependencies here,

+	     * a real os would use

+ 	     *  open (fname, O_WRONLY|O_APPEND|O_CREAT, 0666)

+	     */

+	    if (!(err = fopen (fname, "a+")))

+		err = fopen (devnull, "w");

+	    if (err && (fileno(err) != 2)) {

+		dup2 (fileno (err), 2);

+		fclose (err);

+	    }

+#if defined(SYSV) || defined(SVR4) || defined(WIN32) || defined(__CYGWIN__)

+	    {

+	    static char buf[BUFSIZ];

+	    setvbuf (stderr, buf, _IOLBF, BUFSIZ);

+	    }

+#else

+	    setlinebuf(stderr);

+#endif

+	}

+

+#ifndef _MSC_VER

+	if (getpgrp () == 0)

+	    setpgid (0, 0);

+#endif

+

+#ifdef RLIMIT_DATA

+	if (limitDataSpace >= 0)

+	{

+	    struct rlimit	rlim;

+

+	    if (!getrlimit(RLIMIT_DATA, &rlim))

+	    {

+		if ((limitDataSpace > 0) && (limitDataSpace < rlim.rlim_max))

+		    rlim.rlim_cur = limitDataSpace;

+		else

+		    rlim.rlim_cur = rlim.rlim_max;

+		(void)setrlimit(RLIMIT_DATA, &rlim);

+	    }

+	}

+#endif

+#ifdef RLIMIT_STACK

+	if (limitStackSpace >= 0)

+	{

+	    struct rlimit	rlim;

+

+	    if (!getrlimit(RLIMIT_STACK, &rlim))

+	    {

+		if ((limitStackSpace > 0) && (limitStackSpace < rlim.rlim_max))

+		    rlim.rlim_cur = limitStackSpace;

+		else

+		    rlim.rlim_cur = rlim.rlim_max;

+		(void)setrlimit(RLIMIT_STACK, &rlim);

+	    }

+	}

+#endif

+#ifdef RLIMIT_NOFILE

+	if (limitNoFile >= 0)

+	{

+	    struct rlimit	rlim;

+

+	    if (!getrlimit(RLIMIT_NOFILE, &rlim))

+	    {

+		if ((limitNoFile > 0) && (limitNoFile < rlim.rlim_max))

+		    rlim.rlim_cur = limitNoFile;

+		else

+		    rlim.rlim_cur = rlim.rlim_max;

+		(void)setrlimit(RLIMIT_NOFILE, &rlim);

+	    }

+	}

+#endif

+	LockServer();

+	been_here = TRUE;

+    }

+    TimerInit();

+    OsVendorInit();

+    /*

+     * No log file by default.  OsVendorInit() should call LogInit() with the

+     * log file name if logging to a file is desired.

+     */

+    LogInit(NULL, NULL);

+    SmartScheduleInit ();

+}

+

+void

+OsCleanup(Bool terminating)

+{

+    if (terminating)

+    {

+	UnlockServer();

+    }

+}